From 33ac9bca6cd1158b29d4b1290108d6c8b07610f5 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 5 Jun 2024 16:24:04 -0500
Subject: [PATCH] release: version 0.18.0

---
 CHANGELOG.md | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 Cargo.lock   | 10 +++++-----
 Cargo.toml   |  6 +++---
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d192c38f..9fb181808 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking changes
 
+### Deprecations
+
+### New features
+
+### Fixed bugs
+
+## [0.18.0] - 2024-06-05
+
+### Breaking changes
+
 * Dropped support for `ui.default-revset` config (replaced by `revsets.log` in
   0.8.0).
 
@@ -38,7 +48,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecations
 
-- Attempting to alias a built-in command now gives a warning, rather than being silently ignored.
+* Attempting to alias a built-in command now gives a warning, rather than being
+  silently ignored.
 
 ### New features
 
@@ -61,7 +72,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Added new revsets `mutable()` and `immutable()`.
 
-* Upgraded `scm-record` from v0.2.0 to v0.3.0. See release notes at https://github.com/arxanas/scm-record/releases/tag/v0.3.0
+* Upgraded `scm-record` from v0.2.0 to v0.3.0. See release notes at
+  <https://github.com/arxanas/scm-record/releases/tag/v0.3.0>
 
 * New command `jj fix` that can be configured to update commits by running code
   formatters (or similar tools) on changed files. The configuration schema and
@@ -89,8 +101,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   fetch` works, `jj` does not suffer from the same problems as Git's `git push
   --force-with-lease` in situations when `git fetch` is run in the background.
 
-* When the working copy commit becomes immutable, a new one is automatically created on top of it 
-to avoid letting the user edit the immutable one.
+* When the working copy commit becomes immutable, a new one is automatically created
+  on top of it to avoid letting the user edit the immutable one.
 
 * `jj config list` now properly escapes TOML keys (#1322).
 
@@ -101,6 +113,34 @@ to avoid letting the user edit the immutable one.
   remainder of the cursor row after drawing rather than clearing the entire row
   before drawing, eliminating the "flicker" effect seen on some terminals.
 
+### Contributors
+
+Thanks to the people who made this release happen!
+
+* Alexander Potashev (@aspotashev)
+* Austin Seipp (@thoughtpolice)
+* Benjamin Tan (@bnjmnt4n)
+* Charles Crete (@Cretezy)
+* Danny Hooper (@hooper)
+* Eidolon (@HybridEidolon)
+* Glen Choo (@chooglen)
+* Gregory Anders (@gpanders)
+* Ilya Grigoriev (@ilyagr)
+* Martin von Zweigbergk (@martinvonz)
+* Matt Stark (@matts1)
+* Matthew Davidson (@KingMob)
+* Michael Gattozzi (@mgattozzi)
+* Philip Metzger (@PhilipMetzger)
+* Remo Senekowitsch (@senekor)
+* Thomas Castiglione (@gulbanana)
+* Théo Daron (@Kaporos)
+* Waleed Khan (@arxanas)
+* Yuya Nishihara (@yuja)
+* Daniel Ploch (@torquestomp)
+* jyn (@jyn514)
+* mlcui (@mlcui-google)
+* tinger (@tingerrr)
+
 ## [0.17.1] - 2024-05-07
 
 ### Fixed bugs
diff --git a/Cargo.lock b/Cargo.lock
index 4ea1550c5..7135bf1ab 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -918,7 +918,7 @@ dependencies = [
 
 [[package]]
 name = "gen-protos"
-version = "0.17.1"
+version = "0.18.0"
 dependencies = [
  "prost-build",
 ]
@@ -1680,7 +1680,7 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jj-cli"
-version = "0.17.1"
+version = "0.18.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -1737,7 +1737,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib"
-version = "0.17.1"
+version = "0.18.0"
 dependencies = [
  "assert_matches",
  "async-trait",
@@ -1793,7 +1793,7 @@ dependencies = [
 
 [[package]]
 name = "jj-lib-proc-macros"
-version = "0.17.1"
+version = "0.18.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2931,7 +2931,7 @@ dependencies = [
 
 [[package]]
 name = "testutils"
-version = "0.17.1"
+version = "0.18.0"
 dependencies = [
  "async-trait",
  "config",
diff --git a/Cargo.toml b/Cargo.toml
index 5d30ee952..aa1604393 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
 
 [workspace.package]
-version = "0.17.1"
+version = "0.18.0"
 license = "Apache-2.0"
 rust-version = "1.76"                                 # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix
 edition = "2021"
@@ -116,8 +116,8 @@ zstd = "0.12.4"
 # put all inter-workspace libraries, i.e. those that use 'path = ...' here in
 # their own (alphabetically sorted) block
 
-jj-lib = { path = "lib", version = "0.17.1" }
-jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.17.1" }
+jj-lib = { path = "lib", version = "0.18.0" }
+jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.18.0" }
 testutils = { path = "lib/testutils" }
 
 # Insta suggests compiling these packages in opt mode for faster testing.