.github/PULL_REQUEST_TEMPLATE.md

@@ -2,9 +2,9 @@
 There's no need to add anything here, but feel free to add a personal message.
 Please describe the changes in this PR in the commit message(s) instead, with
 each commit representing one logical change. Address code review comments by
-rewriting the branch rather than adding commits on top. Use force-push when
-pushing the updated branch (`jj git push` does that automatically when you
-rewrite a branch). Merge the PR at will once it's been approved. See
+rewriting the commits rather than adding commits on top. Use force-push when
+pushing the updated commits (`jj git push` does that automatically when you
+rewrite commits). Merge the PR at will once it's been approved. See
 https://github.com/martinvonz/jj/blob/main/docs/contributing.md for details.
 Note that you need to sign Google's CLA to contribute.
 -->

.github/workflows/build-binaries.yml

@@ -41,7 +41,7 @@ jobs:
 
     name: Build binary artifacts
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - name: Install packages (Ubuntu)
         if: matrix.os == 'ubuntu-24.04'
         run: |
@@ -74,7 +74,7 @@ jobs:
           cp $BIN target/out
 
       - name: Publish binary artifact
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
         with:
           name: jj-${{ matrix.target }}
           path: target/out

.github/workflows/build-nix.yml

@@ -19,9 +19,9 @@ jobs:
 
     name: flake check
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
         with:
           fetch-depth: 0
-      - uses: DeterminateSystems/nix-installer-action@ab6bcb2d5af0e904d04aea750e2089e9dc4cbfdd
-      - uses: DeterminateSystems/magic-nix-cache-action@b46e247b898aa56e6d2d2e728dc6df6c84fdb738
+      - uses: DeterminateSystems/nix-installer-action@da36cb69b1c3247ad7a1f931ebfd954a1105ef14
+      - uses: DeterminateSystems/magic-nix-cache-action@87b14cf437d03d37989d87f0fa5ce4f5dc1a330b
       - run: nix flake check -L --show-trace

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
     timeout-minutes: 15
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
 
     # The default version of gpg installed on the runners is a version baked in with git
     # which only contains the components needed by git and doesn't work for our test cases. 
@@ -80,7 +80,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
 
     - name: Install Rust
       uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8
@@ -93,7 +93,7 @@ jobs:
     name: Check protos
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8
         with:
           toolchain: stable
@@ -107,7 +107,7 @@ jobs:
     name: Check formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8
         with:
           toolchain: nightly
@@ -118,7 +118,7 @@ jobs:
     name: Check that MkDocs can build the docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: 3.11
@@ -135,7 +135,7 @@ jobs:
     name: Check that MkDocs can build the docs with Poetry 1.8
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: 3.11
@@ -166,7 +166,7 @@ jobs:
     continue-on-error: ${{ matrix.checks == 'advisories' }}
 
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
     - uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268
       with:
         command: check ${{ matrix.checks }}
@@ -177,7 +177,7 @@ jobs:
       checks: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8
         with:
           toolchain: stable

.github/workflows/codespell.yml

@@ -13,10 +13,10 @@ jobs:
     name: Codespell
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630
         with:
           check_filenames: true
           check_hidden: true
           skip: ./target,./.jj,*.lock,./buck/third-party/rust/BUILD
-          ignore_words_list: crate,NotIn
+          ignore_words_list: crate,NotIn,Wirth

.github/workflows/docs.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - run:  "git fetch origin gh-pages --depth=1"
       - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:

.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
     - name: Install packages (Ubuntu)
       if: matrix.os == 'ubuntu-24.04'
       run: |
@@ -96,7 +96,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends xz-utils liblz4-tool musl-tools
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:
           python-version: 3.11
@@ -127,7 +127,7 @@ jobs:
       contents: write
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
       - run:  "git fetch origin gh-pages --depth=1"
       - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
         with:

.github/workflows/scorecards.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
         with:
           persist-credentials: false
 
@@ -38,14 +38,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93
+        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b
         with:
           sarif_file: results.sarif

.gitignore

@@ -2,12 +2,9 @@
 /rendered-docs
 .direnv
 .envrc
-# generated by nix build, nix-build
+# Generated by nix build, nix-build
 result
-# buck2
-/buck-out/
-/.buckconfig.local
-# generated by the insta crate
+# Generated by the insta crate
 *.pending-snap
 *.snap*
 !cli/tests/cli-reference@.md.snap
@@ -17,3 +14,6 @@ result
 
 # Generated by setting `JJ_TRACE` environment variable.
 jj-trace-*.json
+
+# To make working on buck2 easier (#1997, #4413)
+/buck-out/

CHANGELOG.md

@@ -11,12 +11,151 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Breaking changes
 
+* Revset function names can no longer start with a number.
+
+* Evaluation error of `revsets.short-prefixes` configuration is now reported.
+
+### Deprecations
+
+### New features
+
+* Added diff options to ignore whitespace when comparing lines. Whitespace
+  changes are still highlighted.
+
+* New command `jj simplify-parents` will remove redundant parent edges.
+
+### Fixed bugs
+
+* Error on `trunk()` revset resolution is now handled gracefully.
+  [#4616](https://github.com/martinvonz/jj/issues/4616)
+
+## [0.22.0] - 2024-10-02
+
+### Breaking changes
+
+* Fixing [#4239](https://github.com/martinvonz/jj/issues/4239) means the
+  ordering of some messages have changed.
+
+* Invalid `ui.graph.style` configuration is now an error.
+
+* The builtin template `branch_list` has been renamed to `bookmark_list` as part
+  of the `jj branch` deprecation.
+
 ### Deprecations
 
+* `jj branch` has been deprecated in favor of `jj bookmark`.
+
+  **Rationale:** Jujutsu's branches don't behave like Git branches, which a
+  confused many newcomers, as they expected a similar behavior given the name.
+  We've renamed them to "bookmarks" to match the actual behavior, as we think
+  that describes them better, and they also behave similar to Mercurial's
+  bookmarks.
+
+* `jj obslog` is now called `jj evolution-log`/`jj evolog`. `jj obslog` remains
+  as an alias.
+
+* `jj unsquash` has been deprecated in favor of `jj squash` and
+  `jj diffedit --restore-descendants`.
+
+  **Rationale:** `jj squash` can be used in interactive mode to pull
+  changes from one commit to another, including from a parent commit
+  to a child commit. For fine-grained dependent diffs, such as when
+  the parent and the child commits must successively modify the same
+  location in a file, `jj diffedit --restore-descendants` can be used
+  to set the parent commit to the desired content without altering the
+  content of the child commit.
+
+* The `git.push-branch-prefix` config has been deprecated in favor of
+  `git.push-bookmark-prefix`.
+
+* `conflict()` and `file()` revsets have been renamed to `conflicts()` and `files()`
+  respectively. The old names are still around and will be removed in a future
+  release.
+
 ### New features
 
+* The new config option `snapshot.auto-track` lets you automatically track only
+  the specified paths (all paths by default). Use the new `jj file track`
+  command to manually tracks path that were not automatically tracked. There is
+  no way to list untracked files yet. Use `git status` in a colocated workspace
+  as a workaround.
+  [#323](https://github.com/martinvonz/jj/issues/323)
+
+* `jj fix` now allows fixing unchanged files with the `--include-unchanged-files` flag. This
+  can be used to more easily introduce automatic formatting changes in a new
+  commit separate from other changes.
+
+* `jj workspace add` now accepts a `--sparse-patterns=<MODE>` option, which
+  allows control of the sparse patterns for a newly created workspace: `copy`
+  (inherit from parent; default), `full` (full working copy), or `empty` (the
+  empty working copy).
+
+* New command `jj workspace rename` that can rename the current workspace.
+
+* `jj op log` gained an option to include operation diffs.
+
+* `jj git clone` now accepts a `--remote <REMOTE NAME>` option, which
+  allows to set a name for the remote instead of using the default
+  `origin`.
+
+* `jj op undo` now reports information on the operation that has been undone.
+
+* `jj squash`: the `-k` flag can be used as a shorthand for `--keep-emptied`.
+
+* CommitId / ChangeId template types now support `.normal_hex()`.
+
+* `jj commit` and `jj describe` now accept `--author` option allowing to quickly change
+  author of given commit.
+
+* `jj diffedit`, `jj abandon`, and `jj restore` now accept a `--restore-descendants`
+  flag. When used, descendants of the edited or deleted commits will keep their original
+  content.
+
+* `jj git fetch -b <remote-git-branch-name>` will now warn if the branch(es)
+   can not be found in any of the specified/configured remotes.
+
+* `jj split` now lets the user select all changes in interactive mode. This may be used
+  to keeping all changes into the first commit while keeping the current commit
+  description for the second commit (the newly created empty one).
+
+* Author and committer names are now yellow by default.
+
 ### Fixed bugs
 
+* Update working copy before reporting changes. This prevents errors during reporting
+  from leaving the working copy in a stale state.
+
+* Fixed panic when parsing invalid conflict markers of a particular form.
+  ([#2611](https://github.com/martinvonz/jj/pull/2611))
+
+* Editing a hidden commit now makes it visible.
+
+* The `present()` revset now suppresses missing working copy error. For example,
+  `present(@)` evaluates to `none()` if the current workspace has no
+  working-copy commit.
+
+### Contributors
+
+Thanks to the people who made this release happen!
+
+* Austin Seipp (@thoughtpolice)
+* Danny Hooper (@hooper)
+* Emily Shaffer (@nasamuffin)
+* Essien Ita Essien (@essiene)
+* Ethan Brierley (@eopb)
+* Ilya Grigoriev (@ilyagr)
+* Kevin Liao (@kevincliao)
+* Lukas Wirth (@Veykril)
+* Martin von Zweigbergk (@martinvonz)
+* Mateusz Mikuła (@mati865)
+* mlcui (@mlcui-corp)
+* Philip Metzger (@PhilipMetzger)
+* Samuel Tardieu (@samueltardieu)
+* Stephen Jennings (@jennings)
+* Tyler Goffinet (@qubitz)
+* Vamsi Avula (@avamsi)
+* Yuya Nishihara (@yuja)
+
 ## [0.21.0] - 2024-09-04
 
 ### Breaking changes
@@ -45,7 +184,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 * A tilde (`~`) at the start of the path will now be expanded to the user's home
   directory when configuring a `signing.key` for SSH commit signing.
-  
+
 * When reconfiguring the author, warn that the working copy won't be updated
 
 ### Fixed bugs
@@ -145,7 +284,7 @@ Thanks to the people who made this release happen!
 
 * `jj backout` can now back out multiple commits at once.
 
-* `jj git clone some/nested/path` now creates the full directory tree for 
+* `jj git clone some/nested/path` now creates the full directory tree for
    nested destination paths if they don't exist.
 
 * String patterns now support case‐insensitive matching by suffixing any