diff --git a/.changes/unreleased/Added-20241019-110354.yaml b/.changes/unreleased/Added-20241019-110354.yaml deleted file mode 100644 index 5ec5b747..00000000 --- a/.changes/unreleased/Added-20241019-110354.yaml +++ /dev/null @@ -1,4 +0,0 @@ -kind: Added -body: >- - {trunk, branch checkout}: Add -n/--dry-run flag to print the target branch. -time: 2024-10-19T11:03:54.694618-07:00 diff --git a/.changes/unreleased/Added-20241019-110430.yaml b/.changes/unreleased/Added-20241019-110430.yaml deleted file mode 100644 index 1b6b8e88..00000000 --- a/.changes/unreleased/Added-20241019-110430.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: '{up, down, top, bottom, branch checkout}: Add --detach flag to detach HEAD after checking out the target branch.' -time: 2024-10-19T11:04:30.374611-07:00 diff --git a/.changes/unreleased/Added-20241026-102334.yaml b/.changes/unreleased/Added-20241026-102334.yaml deleted file mode 100644 index 2737cbb3..00000000 --- a/.changes/unreleased/Added-20241026-102334.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Added -body: >- - submit: Add -w/--web flag to open a browser with the submitted CR, - and a `spice.submit.web` configuration option to allow making this the default. -time: 2024-10-26T10:23:34.749014-07:00 diff --git a/.changes/unreleased/Added-20241109-095515.yaml b/.changes/unreleased/Added-20241109-095515.yaml deleted file mode 100644 index 25d6e1f0..00000000 --- a/.changes/unreleased/Added-20241109-095515.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: 'submit: Add `spice.submit.listTemplatesTimeout` configuration option to change the timeout for template lookup operations.' -time: 2024-11-09T09:55:15.926195-08:00 diff --git a/.changes/unreleased/Changed-20241004-210541.yaml b/.changes/unreleased/Changed-20241004-210541.yaml deleted file mode 100644 index 1561d6fe..00000000 --- a/.changes/unreleased/Changed-20241004-210541.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'GitHub: API errors will now include error codes to more easily root-cause issues.' -time: 2024-10-04T21:05:41.265157-07:00 diff --git a/.changes/unreleased/Changed-20241102-095155.yaml b/.changes/unreleased/Changed-20241102-095155.yaml deleted file mode 100644 index f1a3e732..00000000 --- a/.changes/unreleased/Changed-20241102-095155.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'branch split: If the branch being split has been submitted, prompt to associate the CR with one of the branches.' -time: 2024-11-02T09:51:55.847657-07:00 diff --git a/.changes/unreleased/Changed-20241106-052308.yaml b/.changes/unreleased/Changed-20241106-052308.yaml deleted file mode 100644 index ee22c4a9..00000000 --- a/.changes/unreleased/Changed-20241106-052308.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'submit: If a branch has already been pushed to the remote repository with `git push -u`, use that branch name when creating a CR.' -time: 2024-11-06T05:23:08.585547-08:00 diff --git a/.changes/unreleased/Changed-20241108-054719.yaml b/.changes/unreleased/Changed-20241108-054719.yaml deleted file mode 100644 index 2f86421c..00000000 --- a/.changes/unreleased/Changed-20241108-054719.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Changed -body: >- - submit: If a branch name is already taken in the remote, - generate a unique name for the remote branch that is used to submit the CR. -time: 2024-11-08T05:47:19.503116-08:00 diff --git a/.changes/unreleased/Changed-20241108-055122.yaml b/.changes/unreleased/Changed-20241108-055122.yaml deleted file mode 100644 index fef4b800..00000000 --- a/.changes/unreleased/Changed-20241108-055122.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Changed -body: 'submit: When matching externally submitted CRs to a branch, reject matches where the names are equal but their HEADs are not.' -time: 2024-11-08T05:51:22.431767-08:00 diff --git a/.changes/unreleased/Changed-20241109-105306.yaml b/.changes/unreleased/Changed-20241109-105306.yaml deleted file mode 100644 index 296466a0..00000000 --- a/.changes/unreleased/Changed-20241109-105306.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Changed -body: >- - submit: If CR template lookup from the forge times out, - present the outdated templates to the user instead of presenting none. -time: 2024-11-09T10:53:06.221285-08:00 diff --git a/.changes/unreleased/Fixed-20241102-094426.yaml b/.changes/unreleased/Fixed-20241102-094426.yaml deleted file mode 100644 index 29d690e0..00000000 --- a/.changes/unreleased/Fixed-20241102-094426.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: 'submit: Fix incorrect branch name used when a base branch of a submitted branch is renamed.' -time: 2024-11-02T09:44:26.588392-07:00 diff --git a/.changes/v0.8.0.md b/.changes/v0.8.0.md new file mode 100644 index 00000000..88b530df --- /dev/null +++ b/.changes/v0.8.0.md @@ -0,0 +1,15 @@ +## v0.8.0 - 2024-11-09 +### Added +- {trunk, branch checkout}: Add -n/--dry-run flag to print the target branch. +- {up, down, top, bottom, branch checkout}: Add --detach flag to detach HEAD after checking out the target branch. +- submit: Add -w/--web flag to open a browser with the submitted CR, and a `spice.submit.web` configuration option to allow making this the default. +- submit: Add `spice.submit.listTemplatesTimeout` configuration option to change the timeout for template lookup operations. +### Changed +- GitHub: API errors will now include error codes to more easily root-cause issues. +- branch split: If the branch being split has been submitted, prompt to associate the CR with one of the branches. +- submit: If a branch has already been pushed to the remote repository with `git push -u`, use that branch name when creating a CR. +- submit: If a branch name is already taken in the remote, generate a unique name for the remote branch that is used to submit the CR. +- submit: When matching externally submitted CRs to a branch, reject matches where the names are equal but their HEADs are not. +- submit: If CR template lookup from the forge times out, present the outdated templates to the user instead of presenting none. +### Fixed +- submit: Fix incorrect branch name used when a base branch of a submitted branch is renamed. diff --git a/CHANGELOG.md b/CHANGELOG.md index 888ca069..81588dad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and is generated by [Changie](https://github.com/miniscruff/changie). +## v0.8.0 - 2024-11-09 +### Added +- {trunk, branch checkout}: Add -n/--dry-run flag to print the target branch. +- {up, down, top, bottom, branch checkout}: Add --detach flag to detach HEAD after checking out the target branch. +- submit: Add -w/--web flag to open a browser with the submitted CR, and a `spice.submit.web` configuration option to allow making this the default. +- submit: Add `spice.submit.listTemplatesTimeout` configuration option to change the timeout for template lookup operations. +### Changed +- GitHub: API errors will now include error codes to more easily root-cause issues. +- branch split: If the branch being split has been submitted, prompt to associate the CR with one of the branches. +- submit: If a branch has already been pushed to the remote repository with `git push -u`, use that branch name when creating a CR. +- submit: If a branch name is already taken in the remote, generate a unique name for the remote branch that is used to submit the CR. +- submit: When matching externally submitted CRs to a branch, reject matches where the names are equal but their HEADs are not. +- submit: If CR template lookup from the forge times out, present the outdated templates to the user instead of presenting none. +### Fixed +- submit: Fix incorrect branch name used when a base branch of a submitted branch is renamed. + ## v0.7.1 - 2024-10-26 ### Fixed - branch submit: Fix bad log statement in --dry-run mode. diff --git a/doc/src/cli/config.md b/doc/src/cli/config.md index 6d0841dc..8d2cc3eb 100644 --- a/doc/src/cli/config.md +++ b/doc/src/cli/config.md @@ -81,7 +81,7 @@ instead of showing just the current stack. ### spice.submit.listTemplatesTimeout - + Maximum duration that $$gs branch submit$$ will wait to receive a list of available CR templates from the forge. @@ -130,7 +130,7 @@ on a case-by-case basis. ### spice.submit.web - + Whether submission commands ($$gs branch submit$$ and friends) should open a web browser with submitted CRs. diff --git a/doc/src/guide/branch.md b/doc/src/guide/branch.md index 38fb976d..0a88b3e6 100644 --- a/doc/src/guide/branch.md +++ b/doc/src/guide/branch.md @@ -402,7 +402,7 @@ it will prompt you for a name for each new branch. to safely and easily manipulate the commits in the branch before splitting it into multiple branches. - + If you split a branch after submitting it for review, git-spice will prompt you to assign the submitted CR to one of the branches.