Rebase onto upstream

.github/workflows/rebase-onto-upstream.yml

@@ -0,0 +1,44 @@
+name: Rebase onto upstream
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 8 1,15 * *'
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        base_ref:
+          - akirak
+          # - admin
+        upstream_branch:
+          - 'master'
+
+    steps:
+
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        ref: ${{ matrix.base_ref }}
+
+    - name: Fetch the upstream
+      run: |
+        git remote add upstream https://github.com/melpa/melpa.git
+        git fetch upstream ${{ matrix.upstream_branch }}
+
+    - name: Cherry pick commits
+      run: |
+        git config --add user.name 'github-actions[bot]'
+        git config --add user.email '6270544+github-actions[bot]@users.noreply.github.com'
+        git rebase -s ort -X theirs upstream/${{ matrix.upstream_branch }}
+
+    - uses: peter-evans/create-pull-request@v5
+      with:
+        base: ${{ matrix.base_ref }}
+        title: 'Rebase onto upstream'
+        branch: 'rebase-${{ matrix.base_ref }}'
+        labels: automation
+        token: ${{ secrets.PAT_FOR_PR }}

.github/workflows/reset-on-merge.yml

@@ -0,0 +1,50 @@
+name: Reset on merge
+
+on:
+  pull_request:
+    types:
+    - closed
+
+jobs:
+  reset:
+
+    if: |
+      github.event.pull_request.merged == true &&
+      github.base_ref == 'akirak' &&
+      github.head_ref == 'rebase-akirak' &&
+      github.event.pull_request.head.repo.id == github.event.pull_request.base.repo.id
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        ref: ${{ github.base_ref }}
+
+    - name: Tag the last head revision
+      id: backup
+      run: |
+        tag="${{ github.base_ref }}-backup-$(date +'%Y%m%d%H%M%S')"
+        git tag "$tag" "$(git rev-parse HEAD~1)"
+        echo "tag=$tag" >> "$GITHUB_OUTPUT"
+
+    - name: Push the tag
+      uses: ad-m/github-push-action@master
+      with:
+        tags: true
+        branch: ${{ steps.backup.outputs.tag }}
+
+    - name: Reset
+      run: |
+        git fetch origin "$rev"
+        git reset --hard "$rev"
+      env:
+        rev: ${{ github.head_ref }}
+
+    - name: Push the resetted branch
+      uses: ad-m/github-push-action@master
+      with:
+        branch: ${{ github.base_ref }}
+        force: true

.gitignore

@@ -2,39 +2,21 @@
 *.elc
 *~
 .#*
-/.cask
-/.ecukes-failing-scenarios
-/config.el
 /config.mk
 /download_log.db
 /download_log.json.gz
 /download_log_stable.db
 /download_log_stable.json.gz
-/elpa
-/epkgs
-/html-snapshot/archive.json
-/html-snapshot/build-status.json
-/html-snapshot/download_counts.json
-/html-snapshot/recipes.json
-/html-snapshot/updates.rss
-/html-stable/archive.json
-/html-stable/build-status.json
-/html-stable/download_counts.json
-/html-stable/recipes.json
-/html-stable/updates.rss
-/html/archive.json
-/html/build-status.json
-/html/download_counts.json
-/html/recipes.json
-/html/updates.rss
-/packages-snapshot/
-/packages-stable/
-/packages/
+/html*/archive.json
+/html*/build-status.json
+/html*/download_counts.json
+/html*/recipes.json
+/html*/updates.rss
+/packages*/
 /process_log.pid
 /recipes/.dirstamp
 /sandbox
 /service/*/log
 /service/*/supervise
 /service/caddy/.caddy
-/sync
 /working/

package-build/Makefile

@@ -3,16 +3,24 @@ include default.mk
 
 .PHONY: test
 
+# https://github.com/emacscollective/workflows/blob/main/bin/install-deps
+# expects this to find this in this file.
+DEPS  = compat
+
 all: lisp
 
 help:
 	$(info make all          - generate byte-code and autoloads)
 	$(info make lisp         - generate byte-code and autoloads)
+	$(info make redo         - re-generate byte-code and autoloads)
 	$(info make test         - run tests)
 	$(info make demo         - run tests showing their documentation)
 	$(info make clean        - remove generated files)
 	@printf "\n"
 
+redo: clean $(ELCS) loaddefs check-declare
+	@$(MAKE) -C test lisp
+
 lisp: $(ELCS) loaddefs check-declare
 	@$(MAKE) -C test lisp
 

package-build/default.mk

@@ -8,7 +8,7 @@ ELS  += package-build.el
 ELS  += package-recipe-mode.el
 ELCS  = $(ELS:.el=.elc)
 
-DEPS  =
+DEPS  = compat
 
 VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut -c2-)
 

package-build/package-build-badges.el

@@ -1,8 +1,8 @@
 ;;; package-build-badges.el --- Create badges for packages  -*- lexical-binding:t; coding:utf-8 -*-
 
-;; Copyright (C) 2011-2023 Donald Ephraim Curtis
-;; Copyright (C) 2012-2023 Steve Purcell
-;; Copyright (C) 2018-2023 Jonas Bernoulli
+;; Copyright (C) 2011-2024 Donald Ephraim Curtis
+;; Copyright (C) 2012-2024 Steve Purcell
+;; Copyright (C) 2018-2024 Jonas Bernoulli
 ;; Copyright (C) 2021-2023 Free Software Foundation, Inc
 ;; Copyright (C) 2009 Phil Hagelberg
 
@@ -40,7 +40,7 @@
 This is essentially a copy of `elpaa--make-badge'."
   (let* ((file (expand-file-name (concat name "-badge.svg") target-dir))
          (left (or archive (car package-build-badge-data) "myElpa"))
-         (right (url-hexify-string version))
+         (right version)
          (color (or color (cadr package-build-badge-data) "#ff491b"))
          (lw (package-build-badge--string-width left))
          (rw (package-build-badge--string-width right))

package-build/package-build.el

@@ -1,8 +1,8 @@
 ;;; package-build.el --- Tools for assembling a package archive  -*- lexical-binding:t; coding:utf-8 -*-
 
-;; Copyright (C) 2011-2023 Donald Ephraim Curtis
-;; Copyright (C) 2012-2023 Steve Purcell
-;; Copyright (C) 2016-2023 Jonas Bernoulli
+;; Copyright (C) 2011-2024 Donald Ephraim Curtis
+;; Copyright (C) 2012-2024 Steve Purcell
+;; Copyright (C) 2016-2024 Jonas Bernoulli
 ;; Copyright (C) 2009 Phil Hagelberg
 
 ;; Author: Donald Ephraim Curtis <[email protected]>
@@ -13,7 +13,7 @@
 ;; Keywords: maint tools
 
 ;; Package-Version: 4.0.0.50-git
-;; Package-Requires: ((emacs "26.1"))
+;; Package-Requires: ((emacs "26.1") (compat "27.1"))
 
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -42,6 +42,7 @@
 ;;; Code:
 
 (require 'cl-lib)
+(require 'compat nil t)
 (require 'pcase)
 (require 'subr-x)
 
@@ -405,7 +406,7 @@ main library to a version that qualifies as a release, ignoring
 any pre-releases.
 
 Return (COMMIT-HASH COMMITTER-DATE VERSION-STRING)."
-  (when-let ((lib (package-build--main-library rcp)))
+  (and-let* ((lib (package-build--main-library rcp)))
     (with-temp-buffer
       (let (commit date version)
         (save-excursion
@@ -466,7 +467,7 @@ Return (COMMIT-HASH COMMITTER-DATE VERSION-STRING)."
 (defun package-build-pkg-version (rcp)
   "Return version specified in the \"NAME-pkg.el\" file.
 Return (COMMIT-HASH COMMITTER-DATE VERSION-STRING)."
-  (when-let ((file (package-build--pkgfile rcp)))
+  (and-let* ((file (package-build--pkgfile rcp)))
     (let ((regexp (or (oref rcp version-regexp) package-build-version-regexp))
           commit date version)
       (catch 'before-latest
@@ -1075,7 +1076,7 @@ value specified in the file \"NAME.el\"."
                  (if (fboundp 'lm-maintainers)
                      (lm-maintainers)
                    (with-no-warnings
-                     (when-let ((maintainer (lm-maintainer)))
+                     (and-let* ((maintainer (lm-maintainer)))
                        (list maintainer)))))
            (package-desc-from-define
             name version
@@ -1085,10 +1086,15 @@ value specified in the file \"NAME.el\"."
 ^;;; [^ ]*\\.el ---[ \t]*\\(.*?\\)[ \t]*\\(-\\*-.*-\\*-[ \t]*\\)?$" nil t)
                        (match-string-no-properties 1)))
                 "No description available.")
-            (when-let ((require-lines (lm-header-multiline "package-requires")))
-              (package--prepare-dependencies
-               (package-read-from-string
-                (mapconcat #'identity require-lines " "))))
+            (cond
+             ((fboundp 'lm-package-requires)
+              (lm-package-requires))
+             ((fboundp 'package--prepare-dependencies)
+              (and-let* ((require-lines
+                          (lm-header-multiline "package-requires")))
+                (package--prepare-dependencies
+                 (package-read-from-string
+                  (mapconcat #'identity require-lines " "))))))
             ;; `:kind' and `:archive' are handled separately.
             :kind       (or kind 'single)
             ;; The other keyword arguments are appended to the alist
@@ -1569,15 +1575,15 @@ If optional PRETTY-PRINT is non-nil, then pretty-print
           ;; section "Specifications (elpa-packages)" in "README" of the
           ;; "elpa-admin" branch in "emacs/elpa.git" repository; and also
           ;; `elpaa--supported-keywords' and `elpaa--publish-package-spec'.
-          (let ((recipe (package-recipe-lookup name)))
-            (push
-             `(,symbol
-               :url ,(package-recipe--upstream-url recipe)
-               ,@(and (cl-typep recipe 'package-hg-recipe)
-                      (list :vc-backend 'Hg))
-               ,@(when-let* ((branch (oref recipe branch)))
-                   (list :branch branch)))
-             vc-pkgs))))))
+          (and-let* ((recipe (with-demoted-errors "Recipe error: %S"
+                               (package-recipe-lookup name))))
+            (push `(,symbol
+                    :url ,(package-recipe--upstream-url recipe)
+                    ,@(and (cl-typep recipe 'package-hg-recipe)
+                           (list :vc-backend 'Hg))
+                    ,@(and-let* ((branch (oref recipe branch)))
+                        (list :branch branch)))
+                  vc-pkgs))))))
     (setq entries (cl-sort entries #'string< :key #'car))
     (with-temp-file (or file (expand-file-name "archive-contents"))
       (let ((print-level nil)
@@ -1646,7 +1652,7 @@ a package."
      (json-encode
       (cl-mapcan
        (lambda (name)
-         (ignore-errors ; Silently ignore corrupted recipes.
+         (with-demoted-errors "Recipe error: %S"
            (and (package-recipe-lookup name)
                 (with-temp-buffer
                   (insert-file-contents

package-build/package-recipe-mode.el

@@ -1,8 +1,8 @@
 ;;; package-recipe-mode.el --- Major-mode for editing package recipes  -*- lexical-binding:t; coding:utf-8 -*-
 
-;; Copyright (C) 2011-2023 Donald Ephraim Curtis
-;; Copyright (C) 2012-2023 Steve Purcell
-;; Copyright (C) 2016-2023 Jonas Bernoulli
+;; Copyright (C) 2011-2024 Donald Ephraim Curtis
+;; Copyright (C) 2012-2024 Steve Purcell
+;; Copyright (C) 2016-2024 Jonas Bernoulli
 ;; Copyright (C) 2009 Phil Hagelberg
 
 ;; Author: Donald Ephraim Curtis <[email protected]>

package-build/package-recipe.el

@@ -1,6 +1,6 @@
 ;;; package-recipe.el --- Package recipes as EIEIO objects  -*- lexical-binding:t; coding:utf-8 -*-
 
-;; Copyright (C) 2018-2023 Jonas Bernoulli
+;; Copyright (C) 2018-2024 Jonas Bernoulli
 
 ;; Author: Jonas Bernoulli <[email protected]>
 ;; Homepage: https://github.com/melpa/package-build
@@ -27,6 +27,7 @@
 
 ;;; Code:
 
+(require 'compat nil t)
 (require 'eieio)
 (require 'subr-x)
 (require 'url-parse)
@@ -182,17 +183,14 @@ file is invalid, then raise an error."
               (cl-assert (not (plist-get plist :url)) ":url is redundant"))
           (cl-assert (plist-get plist :url) ":url is missing")))
       (dolist (key symbol-keys)
-        (let ((val (plist-get plist key)))
-          (when val
-            (cl-assert (symbolp val) nil "%s must be a symbol but is %S" key val))))
+        (when-let ((val (plist-get plist key)))
+          (cl-assert (symbolp val) nil "%s must be a symbol but is %S" key val)))
       (dolist (key list-keys)
-        (let ((val (plist-get plist key)))
-          (when val
-            (cl-assert (listp val) nil "%s must be a list but is %S" key val))))
+        (when-let ((val (plist-get plist key)))
+          (cl-assert (listp val) nil "%s must be a list but is %S" key val)))
       (dolist (key string-keys)
-        (let ((val (plist-get plist key)))
-          (when val
-            (cl-assert (stringp val) nil "%s must be a string but is %S" key val))))
+        (when-let ((val (plist-get plist key)))
+          (cl-assert (stringp val) nil "%s must be a string but is %S" key val)))
       (when-let ((spec (plist-get plist :files)))
         ;; `:defaults' is only allowed as the first element.
         ;; If we find it in that position, skip over it.

recipes/acm

@@ -0,0 +1,2 @@
+(acm :fetcher github :repo "manateelazycat/lsp-bridge"
+     :files ("acm/*.el" "acm/icons"))

recipes/afterglow

@@ -0,0 +1,2 @@
+(afterglow :fetcher github
+           :repo "ernstvanderlinden/emacs-afterglow")

recipes/akirak

@@ -0,0 +1,2 @@
+(akirak :fetcher github :repo "akirak/emacs-config"
+        :files ("emacs/lisp/*.el"))

recipes/app-monochrome-themes

@@ -0,0 +1,3 @@
+(app-monochrome-themes
+ :fetcher github
+ :repo "Greybeard-Entertainment/app-monochrome")

recipes/apprentice

@@ -0,0 +1 @@
+(apprentice :fetcher github :repo "Sasanidas/Apprentice")

recipes/avy-riben

@@ -0,0 +1,2 @@
+(avy-riben :fetcher github :repo "akirak/emacs-dumb-japanese"
+           :files ("avy-riben.el"))

recipes/beancount

@@ -0,0 +1 @@
+(beancount :fetcher github :repo "beancount/beancount-mode")

recipes/benchmark-init

@@ -1 +1,6 @@
-(benchmark-init :fetcher github :repo "dholm/benchmark-init-el")
+;; I initially intended to use this fork until a bugfix PR is merged.
+;;
+;; However, I added another patch which further enhances the package,
+;; so I probably won't switch back to the original.
+;; https://github.com/akirak/benchmark-init-el/commit/cc16e08c3d3a6e0044046b74c3f6544e46250d4a
+(benchmark-init :fetcher github :repo "akirak/benchmark-init-el")

recipes/bfmt

@@ -0,0 +1 @@
+(bfmt :fetcher github :repo "akirak/bfmt.el")

recipes/chatgpt

@@ -0,0 +1 @@
+(chatgpt :fetcher github :repo "joshcho/ChatGPT.el")

recipes/chatu

@@ -0,0 +1 @@
+(chatu :repo "kimim/chatu" :fetcher github)

recipes/clipsave

@@ -0,0 +1,2 @@
+(clipurl :fetcher github :repo "akirak/clipurl.el"
+         :files ("clipsave.el"))