Merge branch 'release-preparations'

* Branch commit log:
  Makefile.mk: depend on jj-0.32.0
  .github/workflows/testing.yml: install jj-0.32 for CI
  .gitignore: updates
  jj-fzf: in multi-mode, add TAB=toggle-select to help
  .github/workflows/gh-release.sh: add script to create github releases
	.github/workflows/gh-release.sh: add recent git log for prereleases
	.github/workflows/gh-release.sh: script to create github releases
	.github/workflows/testing.yml: fix release title

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

Author: tim-janik

.github/workflows/gh-release.sh

@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+# This Source Code Form is licensed MPL-2.0: http://mozilla.org/MPL/2.0
+set -Eeuo pipefail && SCRIPTNAME=${0##*/} && die() { [ -z "$*" ] || echo "$SCRIPTNAME: $*" >&2; exit 127 ; }
+
+# Usage: gh-release.sh [-x] <TITLE>
+TITLE=
+while test $# -ne 0 ; do
+  case "$1" in \
+    -x)	set -x ;;
+    -*)	die "unknown options" ;;
+    *)	TITLE="$1" ;;
+  esac
+  shift
+done
+test ! -z "$TITLE" || die "missing project title"
+
+# Artifacts
+ARTIFACTS=./artifacts/
+test -d $ARTIFACTS || die "missing release artifacts"
+
+# Release version from current tag
+VV=$(git describe --tags --match='v[0-9]*.[0-9]*.[0-9]*' --exact-match 2>/dev/null ||
+       git describe --match='v[0-9]*.[0-9]*.[0-9]*' 2>/dev/null) || die "missing current version tag"
+V="${VV#v}"
+TITLE="$TITLE $V"
+
+# NEWS, extract first entry
+F_NOTES=
+if grep -s -m1 '^#' NEWS.md | grep -qE "\bv?${V//./\\.}($|[^a-z0-9-])" ; then
+  sed -rn '/^##? / { p; :BEGIN ; n ; /^##? /q ; p ; bBEGIN ; }' NEWS.md > $ARTIFACTS/.notes
+  F_NOTES="-F $ARTIFACTS/.notes"
+else # grab recent git log
+  LAST=$(git describe --match='v[0-9]*.[0-9]*.[0-9]*' HEAD^ | sed 's/-[0-9]\+-g[0-9a-f]\+$//') && (
+    echo "# $TITLE"
+    echo
+    echo 'Development version - may contain bugs or compatibility issues.'
+    echo
+    echo '``````````````````````````````````````````````````````````````````````````````````````'
+    git log --pretty='%s    # %cd %an %h%n%w(0,4,4)%b' \
+	--first-parent --date=short "$LAST..HEAD" |
+      sed -e '/^\s*Signed-off-by:.*<.*@.*>/d' |
+      sed '/^\s*$/{ N; /^\s*\n\s*$/D }'
+    echo '``````````````````````````````````````````````````````````````````````````````````````'
+    echo ) > $ARTIFACTS/.notes &&
+    F_NOTES="-F $ARTIFACTS/.notes"
+fi
+
+# PRERELEASE for lightweight tag
+KIND=--prerelease
+
+# DRAFT release for annotated tag
+git tag -l --format='%(objecttype)' "$VV" | grep -q '^tag' && {
+  KIND=		# immediate release
+  KIND=--draft
+}
+
+# INFO
+echo "TITLE: $TITLE"
+echo "CURRENT_TAG: $VV"
+echo "VERSION: $V"
+echo "ARTIFACTS:" &&
+  ls -l ${F_NOTES#-F} $ARTIFACTS/*
+
+# Create Github release for remote tag
+set -x
+gh release create \
+   --title "$TITLE" \
+   $F_NOTES \
+   --generate-notes \
+   $KIND \
+   --verify-tag \
+   "$VV" \
+   $ARTIFACTS/* </dev/null
+
+# Related links:
+# https://cli.github.com/manual/gh_help_environment

.github/workflows/testing.yml

@@ -21,7 +21,7 @@ jobs:
           sudo tar zxvf - -C /usr/local/bin/ fzf
         fzf --version
     - run: |
-        curl -s -L https://github.com/martinvonz/jj/releases/download/v0.31.0/jj-v0.31.0-x86_64-unknown-linux-musl.tar.gz |
+        curl -s -L https://github.com/martinvonz/jj/releases/download/v0.32.0/jj-v0.32.0-x86_64-unknown-linux-musl.tar.gz |
           sudo tar zxvf - -C /usr/local/bin/ ./jj
         jj --version
     - run: |
@@ -58,7 +58,7 @@ jobs:
       with: { path: ./artifacts, merge-multiple: true }
     - run: ls -alR artifacts/
     - run: |
-        .github/workflows/gh-release.sh "Anklang"
+        .github/workflows/gh-release.sh "JJ-FZF"
 
   Ping-IRC:
     if: always()

.gitignore

@@ -4,3 +4,10 @@
 /artifacts/
 *.tmp*
 .x*
+*.ttf
+*.cast
+*.gif
+*.mp4
+*.webp
+/screencasts/*/
+/*Demo/

Makefile.mk

@@ -31,7 +31,7 @@ check-deps: jj-fzf
 	$Q command -v gsed 2>/dev/null 1>&2 || gsed() { \sed "$$@"; } \
 	&& gsed --version 2>/dev/null | grep -Fq 'GNU sed' || { echo "$@: failed to detect GNU sed as \`gsed\` or \`sed\`" >&2; false; }
 	$Q [[ "`awk 'BEGIN{print(123)}'`" =~ 123 ]] || { echo "$@: ERROR: a usable \`awk\` executable is required" >&2; false; }
-	$Q V="0.31.0" && T="`jj --version --ignore-working-copy`" && $(VERSION_LE) "$$V" "$$T" || { echo "$@: ERROR: jj >= $$V is required, found: $${T%%$$'\n'*}" >&2; false; }
+	$Q V="0.32.0" && T="`jj --version --ignore-working-copy`" && $(VERSION_LE) "$$V" "$$T" || { echo "$@: ERROR: jj >= $$V is required, found: $${T%%$$'\n'*}" >&2; false; }
 	$Q V="0.44.1" && T="`fzf --version`" && $(VERSION_LE) "$$V" "$$T" || { echo "$@: ERROR: fzf >= $$V is required, found: $${T%%$$'\n'*}" >&2; false; }
 	$Q [[ "`command -v column`" =~ column ]] || { echo "$@: ERROR: failed to find the \`column\` executable in \$$PATH" >&2; false; }
 	$Q ./jj-fzf --version >/dev/null || { echo "$@: ERROR: failed to start ./jj-fzf as \`bash\` script" >&2; false; }

jj-fzf

@@ -1543,8 +1543,10 @@ if test -n "$HELPKEYBINDINGS" ; then
   HELPKEYS[Alt-H]='toggle-show-keys'
   DOC['toggle-show-keys']='Display or hide the list of avilable key bindings, persist the setting in `jj-fzf.show-keys` of the `jj` user config.'
 else
-  test -n "$MULTISELECT" &&
+  test -n "$MULTISELECT" && {
     HELPKEYS[Alt-M]='multi-select-exit'
+    HELPKEYS[TAB]='toggle-select'
+  }
 fi
 DISPLAYKEYS="${!HELPKEYS[@]}"
 DISPLAYKEYS=$(sort <<<"${DISPLAYKEYS// /$'\n'}" | grep -vF 'Ctrl-Alt-')