Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(context): add repository path to template context #721

Merged
merged 2 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions git-cliff-core/src/changelog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ mod test {
header: Some(String::from("# Changelog")),
body: Some(String::from(
r#"{% if version %}
## Release [{{ version }}] - {{ timestamp | date(format="%Y-%m-%d") }}
## Release [{{ version }}] - {{ timestamp | date(format="%Y-%m-%d") }} - ({{ repository }})
{% if commit_id %}({{ commit_id }}){% endif %}{% else %}
## Unreleased{% endif %}
{% for group, commits in commits | group_by(attribute="group") %}
Expand Down Expand Up @@ -881,6 +881,7 @@ mod test {
commit_id: Some(String::from("0bc123")),
timestamp: 50000000,
previous: None,
repository: Some(String::from("/root/repo")),
#[cfg(feature = "github")]
github: crate::remote::RemoteReleaseMetadata {
contributors: vec![],
Expand Down Expand Up @@ -941,6 +942,7 @@ mod test {
commit_id: None,
timestamp: 1000,
previous: Some(Box::new(test_release)),
repository: Some(String::from("/root/repo")),
#[cfg(feature = "github")]
github: crate::remote::RemoteReleaseMetadata {
contributors: vec![],
Expand Down Expand Up @@ -974,7 +976,7 @@ mod test {
String::from(
r#"# Changelog

## Release [v1.1.0] - 1970-01-01
## Release [v1.1.0] - 1970-01-01 - (/root/repo)


### Bug Fixes
Expand All @@ -992,7 +994,7 @@ mod test {
#### ui
- do exciting stuff

## Release [v1.0.0] - 1971-08-02
## Release [v1.0.0] - 1971-08-02 - (/root/repo)
(0bc123)

### Bug Fixes
Expand Down Expand Up @@ -1117,7 +1119,7 @@ chore(deps): fix broken deps
#### app
- merge #5

## Release [v1.0.0] - 1971-08-02
## Release [v1.0.0] - 1971-08-02 - (/root/repo)
(0bc123)

### Bug Fixes
Expand Down
26 changes: 16 additions & 10 deletions git-cliff-core/src/release.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,32 @@ use serde::{
#[serde(rename_all = "camelCase")]
pub struct Release<'a> {
/// Release version, git tag.
pub version: Option<String>,
pub version: Option<String>,
/// git tag's message.
pub message: Option<String>,
pub message: Option<String>,
/// Commits made for the release.
pub commits: Vec<Commit<'a>>,
pub commits: Vec<Commit<'a>>,
/// Commit ID of the tag.
#[serde(rename = "commit_id")]
pub commit_id: Option<String>,
pub commit_id: Option<String>,
/// Timestamp of the release in seconds, from epoch.
pub timestamp: i64,
pub timestamp: i64,
/// Previous release.
pub previous: Option<Box<Release<'a>>>,
pub previous: Option<Box<Release<'a>>>,
/// Repository path.
pub repository: Option<String>,
/// Contributors.
#[cfg(feature = "github")]
pub github: RemoteReleaseMetadata,
pub github: RemoteReleaseMetadata,
/// Contributors.
#[cfg(feature = "gitlab")]
pub gitlab: RemoteReleaseMetadata,
pub gitlab: RemoteReleaseMetadata,
/// Contributors.
#[cfg(feature = "gitea")]
pub gitea: RemoteReleaseMetadata,
pub gitea: RemoteReleaseMetadata,
/// Contributors.
#[cfg(feature = "bitbucket")]
pub bitbucket: RemoteReleaseMetadata,
pub bitbucket: RemoteReleaseMetadata,
}

#[cfg(feature = "github")]
Expand Down Expand Up @@ -187,6 +189,7 @@ mod test {
version: Some(String::from(version)),
..Default::default()
})),
repository: Some(String::from("/root/repo")),
#[cfg(feature = "github")]
github: crate::remote::RemoteReleaseMetadata {
contributors: vec![],
Expand Down Expand Up @@ -395,6 +398,7 @@ mod test {
version: Some(String::from("1.0.0")),
..Default::default()
})),
repository: Some(String::from("/root/repo")),
github: RemoteReleaseMetadata {
contributors: vec![],
},
Expand Down Expand Up @@ -681,6 +685,7 @@ mod test {
version: Some(String::from("1.0.0")),
..Default::default()
})),
repository: Some(String::from("/root/repo")),
#[cfg(feature = "github")]
github: RemoteReleaseMetadata {
contributors: vec![],
Expand Down Expand Up @@ -1025,6 +1030,7 @@ mod test {
version: Some(String::from("1.0.0")),
..Default::default()
})),
repository: Some(String::from("/root/repo")),
#[cfg(feature = "github")]
github: RemoteReleaseMetadata {
contributors: vec![],
Expand Down
7 changes: 5 additions & 2 deletions git-cliff-core/src/repo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,18 @@ static TAG_SIGNATURE_REGEX: Lazy<Regex> = lazy_regex!(
///
/// [`Repository`]: GitRepository
pub struct Repository {
inner: GitRepository,
inner: GitRepository,
/// Repository path.
pub path: PathBuf,
}

impl Repository {
/// Initializes (opens) the repository.
pub fn init(path: PathBuf) -> Result<Self> {
if path.exists() {
Ok(Self {
inner: GitRepository::open(path)?,
inner: GitRepository::open(&path)?,
path,
})
} else {
Err(Error::IoError(io::Error::new(
Expand Down
1 change: 1 addition & 0 deletions git-cliff-core/src/template.rs
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ mod test {
commit_id: None,
timestamp: 0,
previous: None,
repository: Some(String::from("/root/repo")),
#[cfg(feature = "github")]
github: crate::remote::RemoteReleaseMetadata {
contributors: vec![],
Expand Down
2 changes: 2 additions & 0 deletions git-cliff-core/tests/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ fn generate_changelog() -> Result<()> {
commit_id: None,
timestamp: 0,
previous: None,
repository: Some(String::from("/root/repo")),
#[cfg(feature = "github")]
github: git_cliff_core::remote::RemoteReleaseMetadata {
contributors: vec![],
Expand Down Expand Up @@ -235,6 +236,7 @@ fn generate_changelog() -> Result<()> {
commit_id: None,
timestamp: 0,
previous: None,
repository: Some(String::from("/root/repo")),
#[cfg(feature = "github")]
github: git_cliff_core::remote::RemoteReleaseMetadata {
contributors: vec![],
Expand Down
2 changes: 2 additions & 0 deletions git-cliff/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ fn process_repository<'a>(
for git_commit in commits.iter().rev() {
let commit = Commit::from(git_commit);
let commit_id = commit.id.to_string();
releases[release_index].repository =
Some(repository.path.to_string_lossy().to_string());
if args.sort == Sort::Newest {
releases[release_index].commits.insert(0, commit);
} else {
Expand Down
2 changes: 2 additions & 0 deletions website/docs/templating/context.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ following context is generated to use for templating:
],
"commit_id": "a440c6eb26404be4877b7e3ad592bfaa5d4eb210 (release commit)",
"timestamp": 1625169301,
"repository": "/path/to/repository",
"previous": {
"version": "previous release"
}
Expand Down Expand Up @@ -156,6 +157,7 @@ If [`conventional_commits`](/docs/configuration/git#conventional_commits) is set
],
"commit_id": "a440c6eb26404be4877b7e3ad592bfaa5d4eb210 (release commit)",
"timestamp": 1625169301,
"repository": "/path/to/repository",
"previous": {
"version": "previous release"
}
Expand Down
8 changes: 8 additions & 0 deletions website/docs/usage/multiple-repos.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@ git cliff --repository path1 path2
```

Note that the changelog will be generated using the merged history of the given repositories.

:::tip

You can use the `{{ repository }}` variable in the template to display which release belongs to which repository.

See [context](/docs/templating/context) for more information.

:::
Loading