From 1263513e4773c23f8e9fcc66e15dd38ede690b51 Mon Sep 17 00:00:00 2001 From: Abhinav Gupta Date: Sun, 25 Aug 2024 15:23:29 -0700 Subject: [PATCH] Release v0.5.0 (#360) --- .changes/unreleased/Added-20240810-100319.yaml | 3 --- .changes/unreleased/Added-20240815-053353.yaml | 6 ------ .changes/unreleased/Added-20240821-213515.yaml | 6 ------ .changes/unreleased/Added-20240824-115459.yaml | 7 ------- .changes/unreleased/Changed-20240816-054428.yaml | 5 ----- .changes/unreleased/Fixed-20240821-082941.yaml | 3 --- .changes/v0.5.0.md | 10 ++++++++++ CHANGELOG.md | 11 +++++++++++ doc/src/cli/config.md | 6 +++--- doc/src/guide/pr.md | 2 +- doc/src/recipes.md | 2 +- 11 files changed, 26 insertions(+), 35 deletions(-) delete mode 100644 .changes/unreleased/Added-20240810-100319.yaml delete mode 100644 .changes/unreleased/Added-20240815-053353.yaml delete mode 100644 .changes/unreleased/Added-20240821-213515.yaml delete mode 100644 .changes/unreleased/Added-20240824-115459.yaml delete mode 100644 .changes/unreleased/Changed-20240816-054428.yaml delete mode 100644 .changes/unreleased/Fixed-20240821-082941.yaml create mode 100644 .changes/v0.5.0.md diff --git a/.changes/unreleased/Added-20240810-100319.yaml b/.changes/unreleased/Added-20240810-100319.yaml deleted file mode 100644 index b1b7a725..00000000 --- a/.changes/unreleased/Added-20240810-100319.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Added -body: 'branch checkout: Add ''spice.branchCheckout.showUntracked'' configuration to always show untracked branches in checkout prompt.' -time: 2024-08-10T10:03:19.137432-07:00 diff --git a/.changes/unreleased/Added-20240815-053353.yaml b/.changes/unreleased/Added-20240815-053353.yaml deleted file mode 100644 index 82f315c3..00000000 --- a/.changes/unreleased/Added-20240815-053353.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Added -body: >- - branch create: Add `--[no-]commit` flag - and accompayning `spice.branchCreate.commit` configuration - to create stacked branches without committing changes. -time: 2024-08-15T05:33:53.799135-07:00 diff --git a/.changes/unreleased/Added-20240821-213515.yaml b/.changes/unreleased/Added-20240821-213515.yaml deleted file mode 100644 index 185f2121..00000000 --- a/.changes/unreleased/Added-20240821-213515.yaml +++ /dev/null @@ -1,6 +0,0 @@ -kind: Added -body: >- - {branch, downstack, upstack, stack} submit: - Support changing the default for --no-publish with the 'spice.submit.publish' configuration. - If the configuration is set to false, use the --publish flag to opt-in to publishing. -time: 2024-08-21T21:35:15.287687-07:00 diff --git a/.changes/unreleased/Added-20240824-115459.yaml b/.changes/unreleased/Added-20240824-115459.yaml deleted file mode 100644 index 7e38075e..00000000 --- a/.changes/unreleased/Added-20240824-115459.yaml +++ /dev/null @@ -1,7 +0,0 @@ -kind: Added -body: >- - submit: When importing existing CRs, - git-spice will also detect existing stack navigation comments - and update them instead of posting duplicates. - This will work only for comments posted by this version or newer. -time: 2024-08-24T11:54:59.628818-07:00 diff --git a/.changes/unreleased/Changed-20240816-054428.yaml b/.changes/unreleased/Changed-20240816-054428.yaml deleted file mode 100644 index a5098a5e..00000000 --- a/.changes/unreleased/Changed-20240816-054428.yaml +++ /dev/null @@ -1,5 +0,0 @@ -kind: Changed -body: >- - {branch, upstack} onto: Rebase commits even if the branch's base matches the target. - This better matches expectations when the branch falls behind the target. -time: 2024-08-16T05:44:28.62315-07:00 diff --git a/.changes/unreleased/Fixed-20240821-082941.yaml b/.changes/unreleased/Fixed-20240821-082941.yaml deleted file mode 100644 index 92e8f80d..00000000 --- a/.changes/unreleased/Fixed-20240821-082941.yaml +++ /dev/null @@ -1,3 +0,0 @@ -kind: Fixed -body: '{branch, stack, upstack, downstack} submit: When submitting with --no-publish, allow pushing to repositories managed by unsupported forges.' -time: 2024-08-21T08:29:41.537238-07:00 diff --git a/.changes/v0.5.0.md b/.changes/v0.5.0.md new file mode 100644 index 00000000..7b80b2d7 --- /dev/null +++ b/.changes/v0.5.0.md @@ -0,0 +1,10 @@ +## v0.5.0 - 2024-08-25 + +### Added +- submit: Add `spice.submit.publish` configuration to allow making `--no-publish` the default. Use this to work with unsupported Git hosting services. +- branch checkout: Add `spice.branchCheckout.showUntracked` configuration to always show untracked branches in checkout prompt. +- branch create: Add `--[no-]commit` flag and accompanying `spice.branchCreate.commit` configuration to create stacked branches without committing changes. +- submit: When importing existing CRs, also detect existing stack navigation comments and update them instead of posting duplicates. This will only work for comments posted git-spice v0.5 or newer. +### Fixed +- submit: When submitting with `--no-publish`, don't fail if the repository is hosted in an unsupported Git hosting services. +- {branch, upstack} onto: Always rebase commits after the operation--even if the branch's base already matches the target. This better matches user expectations when the branch and base diverge. diff --git a/CHANGELOG.md b/CHANGELOG.md index dd0fc736..fab6aae1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,17 @@ 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.5.0 - 2024-08-25 + +### Added +- submit: Add `spice.submit.publish` configuration to allow making `--no-publish` the default. Use this to work with unsupported Git hosting services. +- branch checkout: Add `spice.branchCheckout.showUntracked` configuration to always show untracked branches in checkout prompt. +- branch create: Add `--[no-]commit` flag and accompanying `spice.branchCreate.commit` configuration to create stacked branches without committing changes. +- submit: When importing existing CRs, also detect existing stack navigation comments and update them instead of posting duplicates. This will only work for comments posted git-spice v0.5 or newer. +### Fixed +- submit: When submitting with `--no-publish`, don't fail if the repository is hosted in an unsupported Git hosting services. +- {branch, upstack} onto: Always rebase commits after the operation--even if the branch's base already matches the target. This better matches user expectations when the branch and base diverge. + ## v0.4.0 - 2024-08-09 This release adds support for configuring the behavior of git-spice diff --git a/doc/src/cli/config.md b/doc/src/cli/config.md index c82a081c..3637038c 100644 --- a/doc/src/cli/config.md +++ b/doc/src/cli/config.md @@ -32,7 +32,7 @@ or at the repository level with the `--local` flag. ### spice.branchCheckout.showUntracked - + When running $$gs branch checkout$$ without any arguments, git-spice presents a prompt to select a branch to checkout. @@ -45,7 +45,7 @@ This option controls whether untracked branches are shown in the prompt. ### spice.branchCreate.commit - + Whether $$gs branch create$$ should commit staged changes to the new branch. Set this to `false` to default to creating new branches without committing, @@ -93,7 +93,7 @@ should post or update a navigation comment to the CR. ### spice.submit.publish - + Whether submission commands ($$gs branch submit$$ and friends) should publish a CR to the forge. diff --git a/doc/src/guide/pr.md b/doc/src/guide/pr.md index ee8594e1..e80a3508 100644 --- a/doc/src/guide/pr.md +++ b/doc/src/guide/pr.md @@ -143,7 +143,7 @@ For example, if you have the GitHub CLI installed: This will work even for PRs that were not created by git-spice, or authored by someone else, as long as the above conditions are met. -In or newer, +In or newer, this will also auto-detect [navigation comments](#navigation-comments) posted to the PR by git-spice, and update them if necessary. diff --git a/doc/src/recipes.md b/doc/src/recipes.md index 8c4ac1df..c243b550 100644 --- a/doc/src/recipes.md +++ b/doc/src/recipes.md @@ -11,7 +11,7 @@ description: >- ### Create branches without committing - + The default workflow for git-spice forces you to commit immediately to new branches: $$gs branch create$$ will create a new branch,