git-cliff 2.2.2__tar.gz → 2.3.0__tar.gz

{git_cliff-2.2.2 → git_cliff-2.3.0}/Cargo.lock

@@ -270,9 +270,9 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz"
-version = "0.8.6"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
+checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
 dependencies = [
  "chrono",
  "chrono-tz-build",
@@ -281,9 +281,9 @@ dependencies = [
 
 [[package]]
 name = "chrono-tz-build"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f"
+checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
 dependencies = [
  "parse-zoneinfo",
  "phf",
@@ -544,6 +544,12 @@ dependencies = [
  "litrs",
 ]
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
+
 [[package]]
 name = "either"
 version = "1.11.0"
@@ -753,7 +759,7 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "git-cliff"
-version = "2.2.2"
+version = "2.3.0"
 dependencies = [
  "clap",
  "clap_complete",
@@ -774,11 +780,12 @@ dependencies = [
 
 [[package]]
 name = "git-cliff-core"
-version = "2.2.2"
+version = "2.3.0"
 dependencies = [
  "config",
  "dirs",
  "document-features",
+ "dyn-clone",
  "expect-test",
  "futures",
  "git-conventional",
@@ -853,11 +860,11 @@ dependencies = [
 
 [[package]]
 name = "globwalk"
-version = "0.8.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc"
+checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "ignore",
  "walkdir",
 ]
@@ -1490,9 +1497,9 @@ dependencies = [
 
 [[package]]
 name = "next_version"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3e541a09da6184deaa5f0c9eeec570dbea6ea841d92c84cdfa4ff985aa535fa"
+checksum = "7beae5e84c3330a90f0f89eae10f5cd4c17c3be0f119ab36d94fd908c7b8c8fb"
 dependencies = [
  "conventional_commit_parser",
  "semver",
@@ -2130,18 +2137,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.201"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.201"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2171,9 +2178,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -2371,9 +2378,9 @@ dependencies = [
 
 [[package]]
 name = "tera"
-version = "1.19.1"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "970dff17c11e884a4a09bc76e3a17ef71e01bb13447a11e85226e254fe6d10b8"
+checksum = "ab9d851b45e865f178319da0abdbfe6acbc4328759ff18dafc3a41c16b4cd2ee"
 dependencies = [
  "chrono",
  "chrono-tz",
@@ -2412,18 +2419,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2478,9 +2485,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2495,9 +2502,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2551,9 +2558,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -2563,18 +2570,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.12"
+version = "0.22.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
+checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
 dependencies = [
  "indexmap",
  "serde",

{git_cliff-2.2.2 → git_cliff-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: git-cliff
-Version: 2.2.2
+Version: 2.3.0
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development
 Classifier: Programming Language :: Rust

{git_cliff-2.2.2 → git_cliff-2.3.0}/git-cliff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "git-cliff"
-version = "2.2.2" # managed by release.sh
+version = "2.3.0" # managed by release.sh
 description = "A highly customizable changelog generator ⛰️"
 authors = ["git-cliff contributors <git-cliff@protonmail.com>"]
 license = "MIT OR Apache-2.0"
@@ -11,7 +11,7 @@ keywords = ["changelog", "generator", "conventional", "commit"]
 categories = ["command-line-utilities"]
 default-run = "git-cliff"
 edition = "2021"
-rust-version = "1.74.1"
+rust-version = "1.75.0"
 
 [[bin]]
 name = "git-cliff-completions"
@@ -23,11 +23,15 @@ path = "src/bin/mangen.rs"
 
 [features]
 # check for new versions
-default = ["update-informer", "github"]
+default = ["update-informer", "github", "gitlab", "bitbucket"]
 # inform about new releases
 update-informer = ["dep:update-informer"]
 # enable GitHub integration
 github = ["git-cliff-core/github", "dep:indicatif"]
+# enable GitLab integration
+gitlab = ["git-cliff-core/gitlab", "dep:indicatif"]
+# enable Bitbucket integration
+bitbucket = ["git-cliff-core/bitbucket", "dep:indicatif"]
 
 [dependencies]
 glob.workspace = true
@@ -45,7 +49,7 @@ indicatif = { version = "0.17.8", optional = true }
 env_logger = "0.10.2"
 
 [dependencies.git-cliff-core]
-version = "2.2.2" # managed by release.sh
+version = "2.3.0" # managed by release.sh
 path = "../git-cliff-core"
 
 [dev-dependencies]

{git_cliff-2.2.2 → git_cliff-2.3.0}/git-cliff/src/args.rs

@@ -64,7 +64,7 @@ pub struct Opt {
 		help = "Prints help information",
 		help_heading = "FLAGS"
 	)]
-	pub help:           Option<bool>,
+	pub help:            Option<bool>,
 	#[arg(
 		short = 'V',
 		long,
@@ -73,10 +73,10 @@ pub struct Opt {
 		help = "Prints version information",
 		help_heading = "FLAGS"
 	)]
-	pub version:        Option<bool>,
+	pub version:         Option<bool>,
 	/// Increases the logging verbosity.
 	#[arg(short, long, action = ArgAction::Count, alias = "debug", help_heading = Some("FLAGS"))]
-	pub verbose:        u8,
+	pub verbose:         u8,
 	/// Writes the default configuration file to cliff.toml
 	#[arg(
 	    short,
@@ -85,7 +85,7 @@ pub struct Opt {
 	    num_args = 0..=1,
 	    required = false
 	)]
-	pub init:           Option<Option<String>>,
+	pub init:            Option<Option<String>>,
 	/// Sets the configuration file.
 	#[arg(
 	    short,
@@ -95,7 +95,7 @@ pub struct Opt {
 	    default_value = DEFAULT_CONFIG,
 	    value_parser = Opt::parse_dir
 	)]
-	pub config:         PathBuf,
+	pub config:          PathBuf,
 	/// Sets the working directory.
 	#[arg(
 	    short,
@@ -104,7 +104,7 @@ pub struct Opt {
 	    value_name = "PATH",
 	    value_parser = Opt::parse_dir
 	)]
-	pub workdir:        Option<PathBuf>,
+	pub workdir:         Option<PathBuf>,
 	/// Sets the git repository.
 	#[arg(
 		short,
@@ -114,7 +114,7 @@ pub struct Opt {
 		num_args(1..),
 		value_parser = Opt::parse_dir
 	)]
-	pub repository:     Option<Vec<PathBuf>>,
+	pub repository:      Option<Vec<PathBuf>>,
 	/// Sets the path to include related commits.
 	#[arg(
 		long,
@@ -122,7 +122,7 @@ pub struct Opt {
 		value_name = "PATTERN",
 		num_args(1..)
 	)]
-	pub include_path:   Option<Vec<Pattern>>,
+	pub include_path:    Option<Vec<Pattern>>,
 	/// Sets the path to exclude related commits.
 	#[arg(
 		long,
@@ -130,10 +130,10 @@ pub struct Opt {
 		value_name = "PATTERN",
 		num_args(1..)
 	)]
-	pub exclude_path:   Option<Vec<Pattern>>,
+	pub exclude_path:    Option<Vec<Pattern>>,
 	/// Sets the regex for matching git tags.
 	#[arg(long, env = "GIT_CLIFF_TAG_PATTERN", value_name = "PATTERN")]
-	pub tag_pattern:    Option<Regex>,
+	pub tag_pattern:     Option<Regex>,
 	/// Sets custom commit messages to include in the changelog.
 	#[arg(
 		long,
@@ -141,7 +141,7 @@ pub struct Opt {
 		value_name = "MSG",
 		num_args(1..)
 	)]
-	pub with_commit:    Option<Vec<String>>,
+	pub with_commit:     Option<Vec<String>>,
 	/// Sets commits that will be skipped in the changelog.
 	#[arg(
 		long,
@@ -149,7 +149,7 @@ pub struct Opt {
 		value_name = "SHA1",
 		num_args(1..)
 	)]
-	pub skip_commit:    Option<Vec<String>>,
+	pub skip_commit:     Option<Vec<String>>,
 	/// Prepends entries to the given changelog file.
 	#[arg(
 	    short,
@@ -158,7 +158,7 @@ pub struct Opt {
 	    value_name = "PATH",
 	    value_parser = Opt::parse_dir
 	)]
-	pub prepend:        Option<PathBuf>,
+	pub prepend:         Option<PathBuf>,
 	/// Writes output to the given file.
 	#[arg(
 	    short,
@@ -169,7 +169,7 @@ pub struct Opt {
 	    num_args = 0..=1,
 	    default_missing_value = DEFAULT_OUTPUT
 	)]
-	pub output:         Option<PathBuf>,
+	pub output:          Option<PathBuf>,
 	/// Sets the tag for the latest version.
 	#[arg(
 		short,
@@ -178,13 +178,13 @@ pub struct Opt {
 		value_name = "TAG",
 		allow_hyphen_values = true
 	)]
-	pub tag:            Option<String>,
+	pub tag:             Option<String>,
 	/// Bumps the version for unreleased changes.
 	#[arg(long, help_heading = Some("FLAGS"))]
-	pub bump:           bool,
+	pub bump:            bool,
 	/// Prints bumped version for unreleased changes.
 	#[arg(long, help_heading = Some("FLAGS"))]
-	pub bumped_version: bool,
+	pub bumped_version:  bool,
 	/// Sets the template for the changelog body.
 	#[arg(
 		short,
@@ -193,54 +193,92 @@ pub struct Opt {
 		value_name = "TEMPLATE",
 		allow_hyphen_values = true
 	)]
-	pub body:           Option<String>,
+	pub body:            Option<String>,
 	/// Processes the commits starting from the latest tag.
 	#[arg(short, long, help_heading = Some("FLAGS"))]
-	pub latest:         bool,
+	pub latest:          bool,
 	/// Processes the commits that belong to the current tag.
 	#[arg(long, help_heading = Some("FLAGS"))]
-	pub current:        bool,
+	pub current:         bool,
 	/// Processes the commits that do not belong to a tag.
 	#[arg(short, long, help_heading = Some("FLAGS"))]
-	pub unreleased:     bool,
+	pub unreleased:      bool,
 	/// Sorts the tags topologically.
 	#[arg(long, help_heading = Some("FLAGS"))]
-	pub topo_order:     bool,
+	pub topo_order:      bool,
 	/// Disables the external command execution.
 	#[arg(long, help_heading = Some("FLAGS"))]
-	pub no_exec:        bool,
+	pub no_exec:         bool,
 	/// Prints changelog context as JSON.
 	#[arg(short = 'x', long, help_heading = Some("FLAGS"))]
-	pub context:        bool,
+	pub context:         bool,
 	/// Strips the given parts from the changelog.
 	#[arg(short, long, value_name = "PART", value_enum)]
-	pub strip:          Option<Strip>,
+	pub strip:           Option<Strip>,
 	/// Sets sorting of the commits inside sections.
 	#[arg(
 		long,
 		value_enum,
 		default_value_t = Sort::Oldest
 	)]
-	pub sort:           Sort,
+	pub sort:            Sort,
 	/// Sets the commit range to process.
 	#[arg(value_name = "RANGE", help_heading = Some("ARGS"))]
-	pub range:          Option<String>,
+	pub range:           Option<String>,
 	/// Sets the GitHub API token.
 	#[arg(
 		long,
 		env = "GITHUB_TOKEN",
 		value_name = "TOKEN",
-		hide_env_values = true
+		hide_env_values = true,
+		hide = !cfg!(feature = "github"),
 	)]
-	pub github_token:   Option<SecretString>,
+	pub github_token:    Option<SecretString>,
 	/// Sets the GitHub repository.
 	#[arg(
-	    long,
-	    env = "GITHUB_REPO",
-	    value_parser = clap::value_parser!(RemoteValue),
-	    value_name = "OWNER/REPO"
+		long,
+		env = "GITHUB_REPO",
+		value_parser = clap::value_parser!(RemoteValue),
+		value_name = "OWNER/REPO",
+		hide = !cfg!(feature = "github"),
+	)]
+	pub github_repo:     Option<RemoteValue>,
+	/// Sets the GitLab API token.
+	#[arg(
+		long,
+		env = "GITLAB_TOKEN",
+		value_name = "TOKEN",
+		hide_env_values = true,
+		hide = !cfg!(feature = "gitlab"),
+	)]
+	pub gitlab_token:    Option<SecretString>,
+	/// Sets the GitLab repository.
+	#[arg(
+		long,
+		env = "GITLAB_REPO",
+		value_parser = clap::value_parser!(RemoteValue),
+		value_name = "OWNER/REPO",
+		hide = !cfg!(feature = "gitlab"),
+	)]
+	pub gitlab_repo:     Option<RemoteValue>,
+	/// Sets the Bitbucket API token.
+	#[arg(
+		long,
+		env = "BITBUCKET_TOKEN",
+		value_name = "TOKEN",
+		hide_env_values = true,
+		hide = !cfg!(feature = "bitbucket"),
+	)]
+	pub bitbucket_token: Option<SecretString>,
+	/// Sets the Bitbucket repository.
+	#[arg(
+		long,
+		env = "BITBUCKET_REPO",
+		value_parser = clap::value_parser!(RemoteValue),
+		value_name = "OWNER/REPO",
+		hide = !cfg!(feature = "bitbucket"),
 	)]
-	pub github_repo:    Option<RemoteValue>,
+	pub bitbucket_repo:  Option<RemoteValue>,
 }
 
 /// Custom type for the remote value.

{git_cliff-2.2.2 → git_cliff-2.3.0}/git-cliff/src/lib.rs

@@ -48,6 +48,7 @@ use std::io::{
 	self,
 	Write,
 };
+use std::path::PathBuf;
 use std::time::{
 	SystemTime,
 	UNIX_EPOCH,
@@ -119,7 +120,29 @@ fn process_repository<'a>(
 				config.remote.github.repo = remote.repo;
 			}
 			Err(e) => {
-				debug!("Failed to get remote from repository: {:?}", e);
+				debug!("Failed to get remote from GitHub repository: {:?}", e);
+			}
+		}
+	} else if !config.remote.gitlab.is_set() {
+		match repository.upstream_remote() {
+			Ok(remote) => {
+				debug!("No GitLab remote is set, using remote: {}", remote);
+				config.remote.gitlab.owner = remote.owner;
+				config.remote.gitlab.repo = remote.repo;
+			}
+			Err(e) => {
+				debug!("Failed to get remote from GitLab repository: {:?}", e);
+			}
+		}
+	} else if !config.remote.bitbucket.is_set() {
+		match repository.upstream_remote() {
+			Ok(remote) => {
+				debug!("No Bitbucket remote is set, using remote: {}", remote);
+				config.remote.bitbucket.owner = remote.owner;
+				config.remote.bitbucket.repo = remote.repo;
+			}
+			Err(e) => {
+				debug!("Failed to get remote from Bitbucket repository: {:?}", e);
 			}
 		}
 	}
@@ -385,6 +408,15 @@ pub fn run(mut args: Opt) -> Result<()> {
 			)));
 		}
 	}
+	if args.output.is_some() &&
+		args.prepend.is_some() &&
+		args.output.as_ref() == args.prepend.as_ref()
+	{
+		return Err(Error::ArgumentError(String::from(
+			"'-o' and '-p' can only be used together if they point to different \
+			 files",
+		)));
+	}
 	if args.body.is_some() {
 		config.changelog.body.clone_from(&args.body);
 	}
@@ -402,10 +434,28 @@ pub fn run(mut args: Opt) -> Result<()> {
 	if args.github_token.is_some() {
 		config.remote.github.token.clone_from(&args.github_token);
 	}
+	if args.gitlab_token.is_some() {
+		config.remote.gitlab.token.clone_from(&args.gitlab_token);
+	}
+	if args.bitbucket_token.is_some() {
+		config
+			.remote
+			.bitbucket
+			.token
+			.clone_from(&args.bitbucket_token);
+	}
 	if let Some(ref remote) = args.github_repo {
 		config.remote.github.owner = remote.0.owner.to_string();
 		config.remote.github.repo = remote.0.repo.to_string();
 	}
+	if let Some(ref remote) = args.gitlab_repo {
+		config.remote.gitlab.owner = remote.0.owner.to_string();
+		config.remote.gitlab.repo = remote.0.repo.to_string();
+	}
+	if let Some(ref remote) = args.bitbucket_repo {
+		config.remote.bitbucket.owner = remote.0.owner.to_string();
+		config.remote.bitbucket.repo = remote.0.repo.to_string();
+	}
 	if args.no_exec {
 		if let Some(ref mut preprocessors) = config.git.commit_preprocessors {
 			preprocessors
@@ -498,7 +548,11 @@ pub fn run(mut args: Opt) -> Result<()> {
 		changelog.prepend(fs::read_to_string(path)?, &mut File::create(path)?)?;
 	}
 	if let Some(path) = args.output {
-		let mut output = File::create(path)?;
+		let mut output: Box<dyn Write> = if path == PathBuf::from("-") {
+			Box::new(io::stdout())
+		} else {
+			Box::new(File::create(path)?)
+		};
 		if args.context {
 			changelog.write_context(&mut output)
 		} else {