From 1f35300d133f09386f85ae60bf3cf86cb06fec83 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Fri, 27 Dec 2024 12:14:23 +0100 Subject: [PATCH] update forge Signed-off-by: Andreas Gerler --- bba.org | 2 +- .../dir | 0 .../forge-autoloads.el | 1 + .../forge-bitbucket.el | 0 .../forge-commands.el | 0 .../forge-core.el | 0 .../forge-db.el | 0 .../forge-gitea.el | 0 .../forge-github.el | 0 .../forge-gitlab.el | 0 .../forge-gogs.el | 0 .../forge-issue.el | 7 +++-- .../forge-notify.el | 0 .../forge-pkg.el | 6 ++-- .../forge-post.el | 0 .../forge-pullreq.el | 13 +++++---- .../forge-repo.el | 3 ++ .../forge-repos.el | 0 .../forge-revnote.el | 0 .../forge-semi.el | 0 .../forge-tablist.el | 0 .../forge-topic.el | 28 +++++++++++-------- .../forge-topics.el | 0 .../forge.el | 9 ++++-- .../forge.info | 0 25 files changed, 43 insertions(+), 26 deletions(-) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/dir (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-autoloads.el (98%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-bitbucket.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-commands.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-core.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-db.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-gitea.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-github.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-gitlab.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-gogs.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-issue.el (97%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-notify.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-pkg.el (84%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-post.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-pullreq.el (96%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-repo.el (99%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-repos.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-revnote.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-semi.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-tablist.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-topic.el (98%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge-topics.el (100%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge.el (96%) rename elpa/{forge-20241218.2036 => forge-20241223.1032}/forge.info (100%) diff --git a/bba.org b/bba.org index ba42d353..82dc6179 100644 --- a/bba.org +++ b/bba.org @@ -912,7 +912,7 @@ I still like ido-find-file. [2023-01-17 Tue 09:33] #+begin_src emacs-lisp - (add-to-list 'load-path "~/.emacs.d/elpa/forge-20241218.2036") + (add-to-list 'load-path "~/.emacs.d/elpa/forge-20241223.1032") (with-eval-after-load 'magit (require 'forge)) diff --git a/elpa/forge-20241218.2036/dir b/elpa/forge-20241223.1032/dir similarity index 100% rename from elpa/forge-20241218.2036/dir rename to elpa/forge-20241223.1032/dir diff --git a/elpa/forge-20241218.2036/forge-autoloads.el b/elpa/forge-20241223.1032/forge-autoloads.el similarity index 98% rename from elpa/forge-20241218.2036/forge-autoloads.el rename to elpa/forge-20241223.1032/forge-autoloads.el index af1141c4..1a435fe5 100644 --- a/elpa/forge-20241218.2036/forge-autoloads.el +++ b/elpa/forge-20241223.1032/forge-autoloads.el @@ -18,6 +18,7 @@ If you want to disable this, then you must set this to nil before `magit' is loaded. If you do it before `forge' but after `magit' is loaded, then `magit-mode-map' ends up being modified anyway.") (with-eval-after-load 'magit-mode (when forge-add-default-bindings (keymap-set magit-mode-map "'" #'forge-dispatch) (keymap-set magit-mode-map "N" #'forge-dispatch) (keymap-set magit-mode-map " " #'forge-browse) (keymap-set magit-mode-map " " #'forge-copy-url-at-point-as-kill))) +(with-eval-after-load 'magit-repos (when forge-add-default-bindings (keymap-set magit-repolist-mode-map "N" #'forge-dispatch))) (with-eval-after-load 'git-commit (when forge-add-default-bindings (keymap-set git-commit-mode-map "C-c C-v" #'forge-visit-topic))) (register-definition-prefixes "forge" '("forge-")) diff --git a/elpa/forge-20241218.2036/forge-bitbucket.el b/elpa/forge-20241223.1032/forge-bitbucket.el similarity index 100% rename from elpa/forge-20241218.2036/forge-bitbucket.el rename to elpa/forge-20241223.1032/forge-bitbucket.el diff --git a/elpa/forge-20241218.2036/forge-commands.el b/elpa/forge-20241223.1032/forge-commands.el similarity index 100% rename from elpa/forge-20241218.2036/forge-commands.el rename to elpa/forge-20241223.1032/forge-commands.el diff --git a/elpa/forge-20241218.2036/forge-core.el b/elpa/forge-20241223.1032/forge-core.el similarity index 100% rename from elpa/forge-20241218.2036/forge-core.el rename to elpa/forge-20241223.1032/forge-core.el diff --git a/elpa/forge-20241218.2036/forge-db.el b/elpa/forge-20241223.1032/forge-db.el similarity index 100% rename from elpa/forge-20241218.2036/forge-db.el rename to elpa/forge-20241223.1032/forge-db.el diff --git a/elpa/forge-20241218.2036/forge-gitea.el b/elpa/forge-20241223.1032/forge-gitea.el similarity index 100% rename from elpa/forge-20241218.2036/forge-gitea.el rename to elpa/forge-20241223.1032/forge-gitea.el diff --git a/elpa/forge-20241218.2036/forge-github.el b/elpa/forge-20241223.1032/forge-github.el similarity index 100% rename from elpa/forge-20241218.2036/forge-github.el rename to elpa/forge-20241223.1032/forge-github.el diff --git a/elpa/forge-20241218.2036/forge-gitlab.el b/elpa/forge-20241223.1032/forge-gitlab.el similarity index 100% rename from elpa/forge-20241218.2036/forge-gitlab.el rename to elpa/forge-20241223.1032/forge-gitlab.el diff --git a/elpa/forge-20241218.2036/forge-gogs.el b/elpa/forge-20241223.1032/forge-gogs.el similarity index 100% rename from elpa/forge-20241218.2036/forge-gogs.el rename to elpa/forge-20241223.1032/forge-gogs.el diff --git a/elpa/forge-20241218.2036/forge-issue.el b/elpa/forge-20241223.1032/forge-issue.el similarity index 97% rename from elpa/forge-20241218.2036/forge-issue.el rename to elpa/forge-20241223.1032/forge-issue.el index e0f69fcc..5ca59d68 100644 --- a/elpa/forge-20241218.2036/forge-issue.el +++ b/elpa/forge-20241223.1032/forge-issue.el @@ -153,9 +153,10 @@ an error." (put 'forge-issue 'thing-at-point #'forge-thingatpt--issue) (defun forge-thingatpt--issue () - (and-let* ((repo (forge--repo-for-thingatpt))) - (and (thing-at-point-looking-at "#\\([0-9]+\\)\\_>") - (forge-get-issue repo (string-to-number (match-string 1)))))) + (and-let* (((thing-at-point-looking-at "#\\([0-9]+\\)\\_>")) + (number (string-to-number (match-string 1))) + (repo (forge--repo-for-thingatpt))) + (forge-get-issue repo number))) ;;; Read diff --git a/elpa/forge-20241218.2036/forge-notify.el b/elpa/forge-20241223.1032/forge-notify.el similarity index 100% rename from elpa/forge-20241218.2036/forge-notify.el rename to elpa/forge-20241223.1032/forge-notify.el diff --git a/elpa/forge-20241218.2036/forge-pkg.el b/elpa/forge-20241223.1032/forge-pkg.el similarity index 84% rename from elpa/forge-20241218.2036/forge-pkg.el rename to elpa/forge-20241223.1032/forge-pkg.el index ba6b2b43..bae4fed5 100644 --- a/elpa/forge-20241218.2036/forge-pkg.el +++ b/elpa/forge-20241223.1032/forge-pkg.el @@ -1,5 +1,5 @@ ;; -*- no-byte-compile: t; lexical-binding: nil -*- -(define-package "forge" "20241218.2036" +(define-package "forge" "20241223.1032" "Access Git forges from Magit." '((emacs "29.1") (compat "30.0.0.0") @@ -14,8 +14,8 @@ (transient "0.8.0") (yaml "0.5.5")) :url "https://github.com/magit/forge" - :commit "3b80ace32c23c030d8c12dd9bf266962718545cf" - :revdesc "3b80ace32c23" + :commit "8bace81bce397af6942c7efe012498dc181466d1" + :revdesc "8bace81bce39" :keywords '("git" "tools" "vc") :authors '(("Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev")) :maintainers '(("Jonas Bernoulli" . "emacs.forge@jonas.bernoulli.dev"))) diff --git a/elpa/forge-20241218.2036/forge-post.el b/elpa/forge-20241223.1032/forge-post.el similarity index 100% rename from elpa/forge-20241218.2036/forge-post.el rename to elpa/forge-20241223.1032/forge-post.el diff --git a/elpa/forge-20241218.2036/forge-pullreq.el b/elpa/forge-20241223.1032/forge-pullreq.el similarity index 96% rename from elpa/forge-20241218.2036/forge-pullreq.el rename to elpa/forge-20241223.1032/forge-pullreq.el index 0c0c9afd..e0506c74 100644 --- a/elpa/forge-20241218.2036/forge-pullreq.el +++ b/elpa/forge-20241223.1032/forge-pullreq.el @@ -185,12 +185,13 @@ an error." (put 'forge-pullreq 'thing-at-point #'forge-thingatpt--pullreq) (defun forge-thingatpt--pullreq () - (and-let* ((repo (forge--repo-for-thingatpt))) - (and (thing-at-point-looking-at - (if (forge-gitlab-repository--eieio-childp repo) - "[#!]\\([0-9]+\\)\\_>" - "#\\([0-9]+\\)\\_>")) - (forge-get-pullreq repo (string-to-number (match-string 1)))))) + (and-let* (((thing-at-point-looking-at "\\([#!]\\)\\([0-9]+\\)\\_>")) + (prefix (match-string-no-properties 1)) + (number (string-to-number (match-string-no-properties 2))) + (repo (forge--repo-for-thingatpt)) + ((or (equal prefix "#") + (forge-gitlab-repository--eieio-childp repo)))) + (forge-get-pullreq repo number))) ;;; Read diff --git a/elpa/forge-20241218.2036/forge-repo.el b/elpa/forge-20241223.1032/forge-repo.el similarity index 99% rename from elpa/forge-20241218.2036/forge-repo.el rename to elpa/forge-20241223.1032/forge-repo.el index 47791f55..faa2959d 100644 --- a/elpa/forge-20241218.2036/forge-repo.el +++ b/elpa/forge-20241223.1032/forge-repo.el @@ -303,6 +303,9 @@ an error." (and (derived-mode-p 'forge-repository-list-mode) (and-let* ((id (tabulated-list-get-id))) (forge-get-repository :id id))) + (and (derived-mode-p 'magit-repolist-mode) + (and-let* ((dir (tabulated-list-get-id))) + (forge-get-repository :dir dir))) (and demand (user-error "No repository at point")))) (defun forge--repo-for-thingatpt () diff --git a/elpa/forge-20241218.2036/forge-repos.el b/elpa/forge-20241223.1032/forge-repos.el similarity index 100% rename from elpa/forge-20241218.2036/forge-repos.el rename to elpa/forge-20241223.1032/forge-repos.el diff --git a/elpa/forge-20241218.2036/forge-revnote.el b/elpa/forge-20241223.1032/forge-revnote.el similarity index 100% rename from elpa/forge-20241218.2036/forge-revnote.el rename to elpa/forge-20241223.1032/forge-revnote.el diff --git a/elpa/forge-20241218.2036/forge-semi.el b/elpa/forge-20241223.1032/forge-semi.el similarity index 100% rename from elpa/forge-20241218.2036/forge-semi.el rename to elpa/forge-20241223.1032/forge-semi.el diff --git a/elpa/forge-20241218.2036/forge-tablist.el b/elpa/forge-20241223.1032/forge-tablist.el similarity index 100% rename from elpa/forge-20241218.2036/forge-tablist.el rename to elpa/forge-20241223.1032/forge-tablist.el diff --git a/elpa/forge-20241218.2036/forge-topic.el b/elpa/forge-20241223.1032/forge-topic.el similarity index 98% rename from elpa/forge-20241218.2036/forge-topic.el rename to elpa/forge-20241223.1032/forge-topic.el index dd66c0c7..85b85016 100644 --- a/elpa/forge-20241218.2036/forge-topic.el +++ b/elpa/forge-20241223.1032/forge-topic.el @@ -319,15 +319,14 @@ an error." (put 'forge-topic 'thing-at-point #'forge-thingatpt--topic) (defun forge-thingatpt--topic () - (and-let* ((repo (forge--repo-for-thingatpt))) - (and (thing-at-point-looking-at - (if (forge-gitlab-repository--eieio-childp repo) - "\\(?2:[#!]\\)\\(?1:[0-9]+\\)\\_>" - "#\\([0-9]+\\)\\_>")) - (funcall (if (equal (match-string 2) "!") - #'forge-get-pullreq - #'forge-get-topic) - repo (string-to-number (match-string-no-properties 1)))))) + (and-let* (((thing-at-point-looking-at "\\([#!]\\)\\([0-9]+\\)\\_>")) + (prefix (match-string-no-properties 1)) + (number (string-to-number (match-string-no-properties 2))) + (repo (forge--repo-for-thingatpt))) + (cond ((equal prefix "#") + (forge-get-topic repo number)) + ((forge-gitlab-repository--eieio-childp repo) + (forge-get-pullreq repo number))))) (defun forge-region-topics () (magit-region-values '(issue pullreq))) @@ -715,14 +714,14 @@ can be selected from the start." "Labels: " (forge--format-labels (and obj (forge-get-repository obj))) nil t - (and (forge-topic-p obj) + (and (cl-typep obj 'forge-topic) (forge--format-labels obj crm-separator))))) (defun forge-read-topic-marks (&optional obj) (let ((crm-separator ",")) (magit-completing-read-multiple "Marks: " (forge--format-marks) nil t - (and (forge-topic-p obj) + (and (cl-typep obj 'forge-topic) (forge--format-marks obj crm-separator))))) (defun forge-read-topic-assignees (&optional topic) @@ -1713,6 +1712,10 @@ alist, containing just `text' and `position'.") ;;; Bug-Reference +(defvar forge-bug-reference-remote-files t + "Whether forge may enable `bug-reference-mode' in remote files. +See also `forge-bug-reference-setup'.") + (defun forge-bug-reference-setup () "Setup `bug-reference' in the current buffer. If forge data has been fetched for the current repository, then @@ -1720,6 +1723,9 @@ enable `bug-reference-mode' or `bug-reference-prog-mode' and modify `bug-reference-bug-regexp' if appropriate." (unless (or bug-reference-url-format (not (forge-db t)) + (and buffer-file-name + (not forge-bug-reference-remote-files) + (file-remote-p buffer-file-name)) ;; TODO Allow use in these modes again. (derived-mode-p 'forge-topics-mode 'forge-notifications-mode)) (magit--with-safe-default-directory nil diff --git a/elpa/forge-20241218.2036/forge-topics.el b/elpa/forge-20241223.1032/forge-topics.el similarity index 100% rename from elpa/forge-20241218.2036/forge-topics.el rename to elpa/forge-20241223.1032/forge-topics.el diff --git a/elpa/forge-20241218.2036/forge.el b/elpa/forge-20241223.1032/forge.el similarity index 96% rename from elpa/forge-20241218.2036/forge.el rename to elpa/forge-20241223.1032/forge.el index 81bcf9f3..4212ecc6 100644 --- a/elpa/forge-20241218.2036/forge.el +++ b/elpa/forge-20241223.1032/forge.el @@ -7,8 +7,8 @@ ;; Homepage: https://github.com/magit/forge ;; Keywords: git tools vc -;; Package-Version: 20241218.2036 -;; Package-Revision: 3b80ace32c23 +;; Package-Version: 20241223.1032 +;; Package-Revision: 8bace81bce39 ;; Package-Requires: ( ;; (emacs "29.1") ;; (compat "30.0.0.0") @@ -108,6 +108,11 @@ is loaded, then `magit-mode-map' ends up being modified anyway.") (keymap-set magit-mode-map " " #'forge-copy-url-at-point-as-kill))) +;;;###autoload +(with-eval-after-load 'magit-repos + (when forge-add-default-bindings + (keymap-set magit-repolist-mode-map "N" #'forge-dispatch))) + ;;;###autoload (with-eval-after-load 'git-commit (when forge-add-default-bindings diff --git a/elpa/forge-20241218.2036/forge.info b/elpa/forge-20241223.1032/forge.info similarity index 100% rename from elpa/forge-20241218.2036/forge.info rename to elpa/forge-20241223.1032/forge.info -- 2.47.3