Merge branch 'difftool' into arxanas/difftool-5

jj-vcs · Sep 14, 2023 · 1014144 · 1014144
2 parents ea5692a + 2c74fa8
commit 1014144
Show file tree

Hide file tree

Showing 80 changed files with 2,447 additions and 855 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
     - name: Install Rust
       uses: dtolnay/rust-toolchain@0e66bd3e6b38ec0ad5312288c83e47c143e6b09e
       with:
@@ -41,7 +41,7 @@ jobs:
     name: Check protos
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
       - uses: dtolnay/rust-toolchain@0e66bd3e6b38ec0ad5312288c83e47c143e6b09e
         with:
           toolchain: stable
@@ -55,7 +55,7 @@ jobs:
     name: Check formatting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
       - uses: dtolnay/rust-toolchain@0e66bd3e6b38ec0ad5312288c83e47c143e6b09e
         with:
           toolchain: nightly
@@ -66,7 +66,7 @@ jobs:
     name: Check that MkDocs can build the docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
       - uses: actions/setup-python@v4
         with:
           python-version: 3.11
@@ -91,7 +91,7 @@ jobs:
     continue-on-error: ${{ matrix.checks == 'advisories' }}
 
     steps:
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
     - uses: EmbarkStudios/cargo-deny-action@a50c7d5f86370e02fae8472c398f15a36e517bb8
       with:
         command: check ${{ matrix.checks }}
@@ -102,7 +102,7 @@ jobs:
       checks: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
       - uses: dtolnay/rust-toolchain@0e66bd3e6b38ec0ad5312288c83e47c143e6b09e
         with:
           toolchain: stable

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
@@ -13,7 +13,7 @@ jobs:
     name: Codespell
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
       - uses: codespell-project/actions-codespell@94259cd8be02ad2903ba34a22d9c13de21a74461
         with:
           check_filenames: true

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
       - run:  "git fetch origin gh-pages --depth=1"
       - uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/nix-linux.yml b/.github/workflows/nix-linux.yml
@@ -19,7 +19,7 @@ jobs:
     name: nix-build
     timeout-minutes: 20
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
         with:
           fetch-depth: 0
       - uses: DeterminateSystems/nix-installer-action@65d7c888b2778e8cf30a07a88422ccb23499bfb8

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout repository
-      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+      uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
     - name: Install packages (Ubuntu)
       if: matrix.os == 'ubuntu-20.04'
       run: |
@@ -71,16 +71,48 @@ jobs:
         asset_name: ${{ env.ASSET }}
         asset_content_type: application/octet-stream
 
-  docs-build-deploy:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+  docs-release-archive:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Install packages (Ubuntu)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends xz-utils liblz4-tool musl-tools
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+      - name: Install poetry
+        uses: abatilo/actions-poetry@v2
+        with:
+          poetry-version: latest
+      - name: Compile docs and zip them up
+        run: |
+          poetry install
+          poetry run -- mkdocs build --no-directory-urls
+          archive="jj-${{ github.event.release.tag_name }}-docs-html.tar.gz"
+          tar czf "$archive" -C "rendered-docs" .
+          echo "ASSET=$archive" >> $GITHUB_ENV
+      - name: Upload release archive
+        uses: actions/upload-release-asset@e8f9f06c4b078e705bd2ea027f0926603fc9b4d5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ${{ env.ASSET }}
+          asset_name: ${{ env.ASSET }}
+          asset_content_type: application/octet-stream
+
+  docs-deploy-website-latest-release:
+    runs-on: ubuntu-latest
     permissions:
       contents: write
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
       - run:  "git fetch origin gh-pages --depth=1"
       - uses: actions/setup-python@v4
         with:
@@ -89,7 +121,7 @@ jobs:
         uses: abatilo/actions-poetry@v2
         with:
           poetry-version: latest
-      - name: Install dependencies, compile and deploy docs
+      - name: Install dependencies, compile and deploy docs to the "latest release" section of the website
         run: |
           git config user.name jj-docs-bot
           git config user.email [email protected]

diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
         with:
           persist-credentials: false
 
@@ -38,7 +38,7 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32
         with:
           name: SARIF file
           path: results.sarif

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,11 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-* `jj diff --stat` has been implemented. It shows a histogram of the changes,
-  same as `git diff --stat`. Fixes [#2066](https://github.com/martinvonz/jj/issues/2066)
 
-* `jj git fetch --all-remotes` has been implemented. It fetches all remotes
-  instead of just the default remote
+### Breaking changes
+
+### New features
+
+* The `ancestors()` revset function now takes an optional `depth` argument 
+  to limit the depth of the ancestor set. For example, use `jj log -r 
+  'ancestors(@, 5)` to view the last 5 commits.
+
+* Support for the Watchman filesystem monitor is now bundled by default. Set
+  `core.fsmonitor = "watchman"` in your repo to enable.
+
+* `jj op log` now supports `--no-graph`.
+
+### Fixed bugs
+
+## [0.9.0] - 2023-09-06
 
 ### Breaking changes
 
@@ -50,13 +62,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   parameters. For example, `author(foo@)` is now an error, and the revset alias
   `'revset-aliases.foo@' = '@'` will be failed to parse.
 
+* The `root` revset symbol has been converted to function `root()`.
+
+* The `..x` revset is now evaluated to `root()..x`, which means the root commit
+  is no longer included.
+
 * `jj git push` will now push all branches in the range `remote_branches()..@`
   instead of only branches pointing to `@` or `@-`.
 
 * It's no longer allowed to create a Git remote named "git". Use `jj git remote
   rename` to rename the existing remote.
   [#1690](https://github.com/martinvonz/jj/issues/1690)
 
+* Revset expression like `origin/main` will no longer resolve to a
+  remote-tracking branch. Use `main@origin` instead.
+
 ### New features
 
 * Default template for `jj log` now does not show irrelevant information
@@ -111,11 +131,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * Revsets gained a new function `mine()` that aliases `author(exact:"your_email")`.
 
+* Added support for `::` and `..` revset operators with both left and right
+  operands omitted. These expressions are equivalent to `all()` and `~root()`
+  respectively.
+
 * `jj log` timestamp format now accepts `.utc()` to convert a timestamp to UTC.
 
 * templates now support additional string methods `.starts_with(x)`, `.ends_with(x)`
   `.remove_prefix(x)`, `.remove_suffix(x)`, and `.substr(start, end)`.
 
+* `jj next` and `jj prev` are added, these allow you to traverse the history
+  in a linear style. For people coming from Sapling and `git-branchles`
+  see [#2126](https://github.com/martinvonz/jj/issues/2126) for 
+  further pending improvements.
+
+* `jj diff --stat` has been implemented. It shows a histogram of the changes,
+  same as `git diff --stat`. Fixes [#2066](https://github.com/martinvonz/jj/issues/2066)
+
+* `jj git fetch --all-remotes` has been implemented. It fetches all remotes
+  instead of just the default remote
+
 ### Fixed bugs
 
 * Fix issues related to .gitignore handling of untracked directories
@@ -133,6 +168,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   repository.
   [#2011](https://github.com/martinvonz/jj/issues/2011)
 
+### Contributors
+
+Thanks to the people who made this release happen!
+
+* Alexander Potashev (@aspotashev)
+* Anton Bulakh (@necauqua)
+* Austin Seipp (@thoughtpolice)
+* Benjamin Brittain (@benbrittain)
+* Benjamin Saunders (@Ralith)
+* Christophe Poucet (@poucet)
+* Emily Kyle Fox (@emilykfox)
+* Glen Choo (@chooglen)
+* Ilya Grigoriev (@ilyagr)
+* Kevin Liao (@kevincliao)
+* Linus Arver (@listx)
+* Martin Clausen (@maacl)
+* Martin von Zweigbergk (@martinvonz)
+* Matt Freitas-Stavola (@mbStavola)
+* Oscar Bonilla (@ob)
+* Philip Metzger (@PhilipMetzger)
+* Piotr Kufel (@qfel)
+* Preston Van Loon (@prestonvanloon)
+* Tal Pressman (@talpr)
+* Vamsi Avula (@avamsi)
+* Vincent Breitmoser (@Valodim)
+* Vladimir (@0xdeafbeef)
+* Waleed Khan (@arxanas)
+* Yuya Nishihara (@yuja)
+* Zachary Dremann (@Dr-Emann)
+
+
 ## [0.8.0] - 2023-07-09
 
 ### Breaking changes