diff options
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | default.mk | 5 | ||||
| -rw-r--r-- | lisp/magit-libgit-pkg.el | 8 | ||||
| -rw-r--r-- | lisp/magit-libgit.el | 19 |
4 files changed, 4 insertions, 54 deletions
@@ -221,13 +221,6 @@ define set_package_requires_nongnu (transient ,transient-version) (with-editor ,with-editor-version))) -(--update-package "lisp/magit-libgit.el" "$(MAGIT_LIBGIT_VERSION)" -`((emacs "$(LIBGIT_EMACS_VERSION)") ;` - (compat ,compat-version) - (libgit ,libgit-version) - (seq ,seq-version) - (magit ,magit-version))) - (--update-package "lisp/magit-section.el" "$(MAGIT_SECTION_VERSION)" `((emacs ,emacs-version) ;` (compat ,compat-version) @@ -276,21 +269,6 @@ define set_package_requires_melpa transient-version with-editor-version))) -(with-temp-file "lisp/magit-libgit-pkg.el" - (insert (format -"(define-package \"magit-libgit\" \"$(MAGIT_LIBGIT_VERSION)$(DEV_SUFFIX)\" - \"(POC) Teach Magit to use Libgit2.\" - '((emacs %S) - (compat %S) - (libgit %S) - (magit %S)) - :homepage \"https://magit.vc\" - :keywords '(\"git\" \"tools\" \"vc\")) -" emacs-version - compat-version - libgit-version - magit-version))) - (with-temp-file "lisp/magit-section-pkg.el" (insert (format "(define-package \"magit-section\" \"$(MAGIT_SECTION_VERSION)$(DEV_SUFFIX)\" @@ -311,9 +289,7 @@ define set_package_versions (compat-version "$(COMPAT_VERSION)") (dash-version "$(DASH_VERSION)") (git-commit-version "$(GIT_COMMIT_VERSION)") -(libgit-version "$(LIBGIT_VERSION)") (magit-version "$(MAGIT_VERSION)") -(magit-libgit-version "$(MAGIT_LIBGIT_VERSION)") (magit-section-version "$(MAGIT_SECTION_VERSION)") (seq-version "$(SEQ_VERSION)") (transient-version "$(TRANSIENT_VERSION)") @@ -326,9 +302,7 @@ define set_package_snapshots (compat-version "$(COMPAT_SNAPSHOT)") (dash-version "$(DASH_MELPA_SNAPSHOT)") (git-commit-version "$(GIT_COMMIT_MELPA_SNAPSHOT)") -(libgit-version "$(LIBGIT_MELPA_SNAPSHOT)") (magit-version "$(MAGIT_MELPA_SNAPSHOT)") -(magit-libgit-version "$(MAGIT_LIBGIT_MELPA_SNAPSHOT)") (magit-section-version "$(MAGIT_SECTION_MELPA_SNAPSHOT)") (seq-version "$(SEQ_MELPA_SNAPSHOT)") (transient-version "$(TRANSIENT_MELPA_SNAPSHOT)") @@ -116,9 +116,7 @@ VERSION ?= $(shell \ COMPAT_VERSION = 29.1.4.4 DASH_VERSION = 2.19.1 GIT_COMMIT_VERSION = $(VERSION) -LIBGIT_VERSION = 0 MAGIT_VERSION = $(VERSION) -MAGIT_LIBGIT_VERSION = $(VERSION) MAGIT_SECTION_VERSION = $(VERSION) SEQ_VERSION = 2.24 TRANSIENT_VERSION = 0.5.0 @@ -127,9 +125,7 @@ WITH_EDITOR_VERSION = 3.3.2 COMPAT_SNAPSHOT = $(COMPAT_VERSION) DASH_MELPA_SNAPSHOT = 20221013 GIT_COMMIT_MELPA_SNAPSHOT = 20231030 -LIBGIT_MELPA_SNAPSHOT = 0 MAGIT_MELPA_SNAPSHOT = 20231202 -MAGIT_LIBGIT_MELPA_SNAPSHOT = 20230924 MAGIT_SECTION_MELPA_SNAPSHOT = 20231202 SEQ_MELPA_SNAPSHOT = $(SEQ_VERSION) TRANSIENT_MELPA_SNAPSHOT = 20231204 @@ -138,7 +134,6 @@ WITH_EDITOR_MELPA_SNAPSHOT = 20230917 DEV_VERSION_SUFFIX = .50-git EMACS_VERSION = 25.1 -LIBGIT_EMACS_VERSION = 26.1 EMACSOLD := $(shell $(BATCH) --eval \ "(and (version< emacs-version \"$(EMACS_VERSION)\") (princ \"true\"))") diff --git a/lisp/magit-libgit-pkg.el b/lisp/magit-libgit-pkg.el deleted file mode 100644 index 12361e5..0000000 --- a/lisp/magit-libgit-pkg.el +++ /dev/null @@ -1,8 +0,0 @@ -(define-package "magit-libgit" "3.3.0.50-git" - "(POC) Teach Magit to use Libgit2." - '((emacs "25.1") - (compat "29.1.4.4") - (libgit "0") - (magit "20231202")) - :homepage "https://magit.vc" - :keywords '("git" "tools" "vc")) diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el index 144999e..fa04e91 100644 --- a/lisp/magit-libgit.el +++ b/lisp/magit-libgit.el @@ -5,17 +5,6 @@ ;; Author: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev> ;; Maintainer: Jonas Bernoulli <emacs.magit@jonas.bernoulli.dev> -;; Homepage: https://github.com/magit/magit -;; Keywords: git tools vc - -;; Package-Version: 3.3.0.50-git -;; Package-Requires: ( -;; (emacs "26.1") -;; (compat "29.1.4.4") -;; (libgit "0") -;; (seq "2.24") -;; (magit "3.3.0")) - ;; SPDX-License-Identifier: GPL-3.0-or-later ;; Magit is free software: you can redistribute it and/or modify @@ -36,7 +25,10 @@ ;;; Commentary: -;; This package teaches Magit to use functions provided by the +;; This library is not used by default and it is highly experimental. +;; It only implements a single method. Do not use this. + +;; This library teaches Magit to use functions provided by the ;; `libegit2' module to perform certain tasks. That module used the ;; Libgit2 implementation of the Git core methods and is implemented ;; in the `libgit' package. @@ -45,9 +37,6 @@ ;; all the time increases performance; especially on Windows where ;; starting a process is unreasonably slow. -;; This package is still experimental and not many functions have been -;; reimplemented to use `libgit' yet. - ;;; Code: (require 'cl-lib) |