Merge branch 'release-preparations'

* Branch commit log:
  lib/exectool.sh: avoid exit status warnings from jj show --tool
  .github/workflows/testing.yml: build jj-fzf.1.gz as release artifact
  Makefile.mk: add build rule for artifacts/jj-fzf.1.gz
  .github/workflows/inactive.yml: handle inactive issues and PRs
  jj-fzf: rename oplog and oplog-browser commands

Signed-off-by: Tim Janik <timj@gnu.org>

Author: tim-janik

.github/workflows/inactive.yml

@@ -0,0 +1,36 @@
+# This Source Code Form is licensed MPL-2.0: http://mozilla.org/MPL/2.0
+
+# Linting: xclip -sel c < .github/workflows/inactive.yml # https://rhysd.github.io/actionlint/
+name: Inactive Issue Handling
+
+on:
+  schedule:
+    - cron: "7 0 * * *"
+
+jobs:
+  inactive-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v10
+        with:
+          stale-issue-label: "inactive"
+          stale-issue-message: >
+            This issue is considered stale,
+            because it has been open for several weeks with no activity.
+          close-issue-message: >
+            Thank you for your contribution. This issue is being closed,
+            because it has been open for several weeks with no activity.
+            Feel free to reopen this issue when more information or
+            updates are available.
+          days-before-issue-stale: 31
+          days-before-issue-close: 21
+          stale-pr-label: "inactive"
+          stale-pr-message: >
+            This PR is considered stale,
+            because it has been open for several weeks with no activity.
+          days-before-pr-stale: 91
+          days-before-pr-close: -1
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/testing.yml

@@ -43,6 +43,8 @@ jobs:
         make distcheck
     - run: |
         make artifacts/jj-fzf.sfx
+    - run: |
+        make artifacts/jj-fzf.1.gz
     - uses: actions/upload-artifact@v4
       with: { name: jj-fzf-Artifacts, path: artifacts/ }
 

Makefile.mk

@@ -123,6 +123,13 @@ artifacts/jj-fzf.sfx: all
 	$Q rm -rf xinst/
 	$Q echo "SFX archive ready: $@" | sed '1h; 1s/./=/g; 1p; 1x; $$p; $$x'
 
+# == artifacts/jj-fzf.1.gz ==
+artifacts/jj-fzf.1.gz: doc/jj-fzf.1
+	$(QGEN)
+	$Q cp doc/jj-fzf.1 artifacts/jj-fzf.1
+	$Q gzip -9 artifacts/jj-fzf.1
+	$Q echo "Man page ready: $@" | sed '1h; 1s/./=/g; 1p; 1x; $$p; $$x'
+
 # == clean ==
 clean:
 	rm -f $(CLEANFILES)

jj-fzf

@@ -840,7 +840,7 @@ operation_id_resolve()
 )
 
 # Show `jj op log` but mark undone operations with '⋯'
-op_log_oneline()
+oplog()
 (
   temp_dir
   # Determine range of undo operations
@@ -852,11 +852,11 @@ op_log_oneline()
     jj --no-pager --ignore-working-copy op log --color=always -T "$JJ_FZF_OP_LOG_ONELINE16"
   fi
 )
-FUNCTIONS+=( 'op_log_oneline' )
+FUNCTIONS+=( 'oplog' )
 
 # Oplog
-DOC['op-log']='Use `jj op log` to browse the recent operations log. Use hotkeys to change the preview between diff, history and oplog entry mode. Undo the selected operation or restore its working copy into a new commit.'
-op-log()
+DOC['oplog-browser']='Use `jj op log` to browse the recent operations log. Use hotkeys to change the preview between diff, history and oplog entry mode. Undo the selected operation or restore its working copy into a new commit.'
+oplog-browser()
 (
   temp_dir
   echo > $TEMPD/oplog.env
@@ -871,10 +871,10 @@ op-log()
   H="$H"$'Alt-Y: Redo the last undo operation (marked `⋯`)\n'
   H="$H"$'Alt-Z: Undo the next operation (not already marked `⋯`)\n'
   echo 'VIEW=preview_oppatch'		>> $TEMPD/oplog.env
-  export FZF_DEFAULT_COMMAND="$ABSPATHSCRIPT op_log_oneline" TEMPD ABSPATHSCRIPT
+  export FZF_DEFAULT_COMMAND="$ABSPATHSCRIPT oplog" TEMPD ABSPATHSCRIPT
   RELOAD='reload(eval "$FZF_DEFAULT_COMMAND")'
   "${FZFPOPUP[@]}" \
-    --border-label '-[ OP-LOG ]-' --color=border:bright-yellow,label:bright-yellow \
+    --border-label '-[ OPLOG-BROWSER ]-' --color=border:bright-yellow,label:bright-yellow \
     --prompt "Operation > " \
     --header "$H" --header-first \
     --bind "ctrl-d:execute-silent( sed 's/^VIEW=.*/VIEW=preview_opdiff/' -i $TEMPD/oplog.env )+refresh-preview" \
@@ -892,7 +892,7 @@ op-log()
     --no-tac --no-sort +m
   # TODO: remove alt-w in jj-fzf-0.26
 )
-KEYBINDINGS["Ctrl-O"]="op-log"
+KEYBINDINGS["Ctrl-O"]="oplog-browser"
 
 restore-commit()
 (

lib/exectool.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 # This Source Code Form is licensed MPL-2.0: http://mozilla.org/MPL/2.0
-exec $EXECTOOL_CMD "$@"
+$EXECTOOL_CMD "$@" || : # avoid 'Warning: Tool exited with exit status: 1'
 # Hook to serve as a single-executable trampoline for e.g. `EXECTOOL_CMD="git diff" jj show --tool exectool.sh`