From 386291f2d86ec1125ebc962b6ecb749715e86a3d Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Sat, 21 Dec 2024 16:40:19 +0100 Subject: [PATCH] update git-gutter and enable it for cfengine3-mode Signed-off-by: Andreas Gerler --- bba-programming.org | 2 +- elpa/ghub-20240507.1647/gtea.el | 141 ------------------ .../git-gutter-20240425.647/git-gutter-pkg.el | 12 -- .../git-gutter-autoloads.el | 18 +-- .../git-gutter-pkg.el | 10 ++ .../git-gutter.el | 11 +- 6 files changed, 26 insertions(+), 168 deletions(-) delete mode 100644 elpa/ghub-20240507.1647/gtea.el delete mode 100644 elpa/git-gutter-20240425.647/git-gutter-pkg.el rename elpa/{git-gutter-20240425.647 => git-gutter-20241212.1415}/git-gutter-autoloads.el (86%) create mode 100644 elpa/git-gutter-20241212.1415/git-gutter-pkg.el rename elpa/{git-gutter-20240425.647 => git-gutter-20241212.1415}/git-gutter.el (99%) diff --git a/bba-programming.org b/bba-programming.org index 18b4c20d..3503d4c8 100644 --- a/bba-programming.org +++ b/bba-programming.org @@ -62,7 +62,7 @@ (add-hook 'cfengine3-mode-hook (lambda () (which-function-mode) - + (git-gutter-mode) (define-key cfengine3-mode-map "\C-c\S-t" (lambda() (interactive) (shell-command "~/bin/cfengine_update_testing.sh" ))) diff --git a/elpa/ghub-20240507.1647/gtea.el b/elpa/ghub-20240507.1647/gtea.el deleted file mode 100644 index e7c0292f..00000000 --- a/elpa/ghub-20240507.1647/gtea.el +++ /dev/null @@ -1,141 +0,0 @@ -;;; gtea.el --- Client library for the Gitea API -*- lexical-binding:t -*- - -;; Copyright (C) 2016-2024 Jonas Bernoulli - -;; Author: Jonas Bernoulli -;; Homepage: https://github.com/magit/ghub -;; Keywords: tools - -;; SPDX-License-Identifier: GPL-3.0-or-later - -;; This file is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published -;; by the Free Software Foundation, either version 3 of the License, -;; or (at your option) any later version. -;; -;; This file is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this file. If not, see . - -;;; Commentary: - -;; Gtea is a library that provides basic support for using the Gitea API -;; from Emacs packages. It abstracts access to API resources using only -;; a handful of functions that are not resource-specific. - -;; This library is implemented on top of Ghub. Unlike Ghub, Gtea does -;; not support the guided creation of tokens because Gitea lacks the -;; features that would be necessary to implement that. Users have to -;; create tokens through the web interface. - -;;; Code: - -(require 'ghub) - -(defconst gtea-default-host "localhost:3000/api/v1" - "The default Gitea host.") - -;; HEAD does not appear to be supported. - -(cl-defun gtea-get (resource &optional params - &key query payload headers - silent unpaginate noerror reader - username auth host - callback errorback extra) - "Make a `GET' request for RESOURCE, with optional query PARAMS. -Like calling `ghub-request' (which see) with \"GET\" as METHOD -and `gitea' as FORGE." - (ghub-request "GET" resource params :forge 'gitea - :query query :payload payload :headers headers - :silent silent :unpaginate unpaginate - :noerror noerror :reader reader - :username username :auth auth :host host - :callback callback :errorback errorback :extra extra)) - -(cl-defun gtea-put (resource &optional params - &key query payload headers - silent unpaginate noerror reader - username auth host - callback errorback extra) - "Make a `PUT' request for RESOURCE, with optional payload PARAMS. -Like calling `ghub-request' (which see) with \"PUT\" as METHOD -and `gitea' as FORGE." - (ghub-request "PUT" resource params :forge 'gitea - :query query :payload payload :headers headers - :silent silent :unpaginate unpaginate - :noerror noerror :reader reader - :username username :auth auth :host host - :callback callback :errorback errorback :extra extra)) - -(cl-defun gtea-post (resource &optional params - &key query payload headers - silent unpaginate noerror reader - username auth host - callback errorback extra) - "Make a `POST' request for RESOURCE, with optional payload PARAMS. -Like calling `ghub-request' (which see) with \"POST\" as METHOD -and `gitea' as FORGE." - (ghub-request "POST" resource params :forge 'gitea - :query query :payload payload :headers headers - :silent silent :unpaginate unpaginate - :noerror noerror :reader reader - :username username :auth auth :host host - :callback callback :errorback errorback :extra extra)) - -(cl-defun gtea-patch (resource &optional params - &key query payload headers - silent unpaginate noerror reader - username auth host - callback errorback extra) - "Make a `PATCH' request for RESOURCE, with optional payload PARAMS. -Like calling `ghub-request' (which see) with \"PATCH\" as METHOD -and `gitea' as FORGE." - (ghub-request "PATCH" resource params :forge 'gitea - :query query :payload payload :headers headers - :silent silent :unpaginate unpaginate - :noerror noerror :reader reader - :username username :auth auth :host host - :callback callback :errorback errorback :extra extra)) - -(cl-defun gtea-delete (resource &optional params - &key query payload headers - silent unpaginate noerror reader - username auth host - callback errorback extra) - "Make a `DELETE' request for RESOURCE, with optional payload PARAMS. -Like calling `ghub-request' (which see) with \"DELETE\" as METHOD -and `gitea' as FORGE." - (ghub-request "DELETE" resource params :forge 'gitea - :query query :payload payload :headers headers - :silent silent :unpaginate unpaginate - :noerror noerror :reader reader - :username username :auth auth :host host - :callback callback :errorback errorback :extra extra)) - -(cl-defun gtea-request (method resource &optional params - &key query payload headers - silent unpaginate noerror reader - username auth host - callback errorback extra) - "Make a request for RESOURCE and return the response body. -Like calling `ghub-request' (which see) with `gitea' as FORGE." - (ghub-request method resource params :forge 'gitea - :query query :payload payload :headers headers - :silent silent :unpaginate unpaginate - :noerror noerror :reader reader - :username username :auth auth :host host - :callback callback :errorback errorback :extra extra)) - -(cl-defun gtea-repository-id (owner name &key username auth host) - "Return the id of the repository specified by OWNER, NAME and HOST." - (number-to-string - (cdr (assq 'id (gtea-get (format "/repos/%s/%s" owner name) - nil :username username :auth auth :host host))))) - -;;; _ -(provide 'gtea) -;;; gtea.el ends here diff --git a/elpa/git-gutter-20240425.647/git-gutter-pkg.el b/elpa/git-gutter-20240425.647/git-gutter-pkg.el deleted file mode 100644 index 07a5135d..00000000 --- a/elpa/git-gutter-20240425.647/git-gutter-pkg.el +++ /dev/null @@ -1,12 +0,0 @@ -(define-package "git-gutter" "20240425.647" "Port of Sublime Text plugin GitGutter" - '((emacs "25.1")) - :commit "9afe45b41a82a332606d3e70ef85d323d27b9e4f" :authors - '(("Syohei YOSHIDA" . "syohex@gmail.com")) - :maintainers - '(("Neil Okamoto" . "neil.okamoto+melpa@gmail.com")) - :maintainer - '("Neil Okamoto" . "neil.okamoto+melpa@gmail.com") - :url "https://github.com/emacsorphanage/git-gutter") -;; Local Variables: -;; no-byte-compile: t -;; End: diff --git a/elpa/git-gutter-20240425.647/git-gutter-autoloads.el b/elpa/git-gutter-20241212.1415/git-gutter-autoloads.el similarity index 86% rename from elpa/git-gutter-20240425.647/git-gutter-autoloads.el rename to elpa/git-gutter-20241212.1415/git-gutter-autoloads.el index 444065e7..d0026a0b 100644 --- a/elpa/git-gutter-20240425.647/git-gutter-autoloads.el +++ b/elpa/git-gutter-20241212.1415/git-gutter-autoloads.el @@ -16,19 +16,19 @@ Setup for linum-mode.") (autoload 'git-gutter-mode "git-gutter" "\ Git-Gutter mode -This is a minor mode. If called interactively, toggle the -`Git-Gutter mode' mode. If the prefix argument is positive, -enable the mode, and if it is zero or negative, disable the mode. +This is a minor mode. If called interactively, toggle the `Git-Gutter +mode' mode. If the prefix argument is positive, enable the mode, and if +it is zero or negative, disable the mode. -If called from Lisp, toggle the mode if ARG is `toggle'. Enable -the mode if ARG is nil, omitted, or is a positive number. -Disable the mode if ARG is a negative number. +If called from Lisp, toggle the mode if ARG is `toggle'. Enable the +mode if ARG is nil, omitted, or is a positive number. Disable the mode +if ARG is a negative number. To check whether the minor mode is enabled in the current buffer, -evaluate `git-gutter-mode'. +evaluate the variable `git-gutter-mode'. -The mode's hook is called both when the mode is enabled and when -it is disabled. +The mode's hook is called both when the mode is enabled and when it is +disabled. (fn &optional ARG)" t) (put 'global-git-gutter-mode 'globalized-minor-mode t) diff --git a/elpa/git-gutter-20241212.1415/git-gutter-pkg.el b/elpa/git-gutter-20241212.1415/git-gutter-pkg.el new file mode 100644 index 00000000..c7af7267 --- /dev/null +++ b/elpa/git-gutter-20241212.1415/git-gutter-pkg.el @@ -0,0 +1,10 @@ +;; -*- no-byte-compile: t; lexical-binding: nil -*- +(define-package "git-gutter" "20241212.1415" + "Port of Sublime Text plugin GitGutter." + '((emacs "25.1")) + :url "https://github.com/emacsorphanage/git-gutter" + :commit "3bdead17db7b84270c00e5a6b5ad02fa87ddd52e" + :revdesc "3bdead17db7b" + :authors '(("Syohei YOSHIDA" . "syohex@gmail.com")) + :maintainers '(("Neil Okamoto" . "neil.okamoto+melpa@gmail.com") + ("Jen-Chieh" . "jcs090218@gmail.com"))) diff --git a/elpa/git-gutter-20240425.647/git-gutter.el b/elpa/git-gutter-20241212.1415/git-gutter.el similarity index 99% rename from elpa/git-gutter-20240425.647/git-gutter.el rename to elpa/git-gutter-20241212.1415/git-gutter.el index 77c4ec0e..774a10d0 100644 --- a/elpa/git-gutter-20240425.647/git-gutter.el +++ b/elpa/git-gutter-20241212.1415/git-gutter.el @@ -2,13 +2,14 @@ ;; Copyright (C) 2016-2020 Syohei YOSHIDA ;; Copyright (C) 2020-2022 Neil Okamoto -;; Copyright (C) 2020-2022 Shen, Jen-Chieh +;; Copyright (C) 2020-2024 Shen, Jen-Chieh ;; Author: Syohei YOSHIDA ;; Maintainer: Neil Okamoto ;; Shen, Jen-Chieh ;; URL: https://github.com/emacsorphanage/git-gutter -;; Version: 0.92 +;; Package-Version: 20241212.1415 +;; Package-Revision: 3bdead17db7b ;; Package-Requires: ((emacs "25.1")) ;; This program is free software; you can redistribute it and/or modify @@ -250,8 +251,8 @@ Argument TEST is the case before BODY execution." (defun git-gutter:in-git-repository-p () (when (executable-find "git" t) (with-temp-buffer - (when-let ((exec-result (git-gutter:execute-command - "git" t "rev-parse" "--is-inside-work-tree"))) + (when-let* ((exec-result (git-gutter:execute-command + "git" t "rev-parse" "--is-inside-work-tree"))) (when (zerop exec-result) (goto-char (point-min)) (looking-at-p "true")))))) @@ -1143,7 +1144,7 @@ start revision." (delete-file original)))))) ;; for linum-user -(when (and (bound-and-true-p global-linum-mode) (not (boundp 'git-gutter-fringe))) +(when (and (and (boundp 'global-linum-mode) global-linum-mode) (not (boundp 'git-gutter-fringe))) (git-gutter:linum-setup)) (defun git-gutter:all-hunks () -- 2.47.3