From patchwork Mon Apr 27 19:11:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christine Lemmer-Webber X-Patchwork-Id: 21689 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4F98427BBE4; Mon, 27 Apr 2020 20:12:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E0B1E27BBE1 for ; Mon, 27 Apr 2020 20:12:17 +0100 (BST) Received: from localhost ([::1]:59234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT9Au-000329-6V for patchwork@mira.cbaines.net; Mon, 27 Apr 2020 15:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42096) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT9Aj-00030M-AQ for guix-patches@gnu.org; Mon, 27 Apr 2020 15:12:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT9Ah-0002pq-RP for guix-patches@gnu.org; Mon, 27 Apr 2020 15:12:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jT9Ah-0002ph-Dy for guix-patches@gnu.org; Mon, 27 Apr 2020 15:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jT9Ag-0005rd-8N for guix-patches@gnu.org; Mon, 27 Apr 2020 15:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40417] Add emacs-magit-annex Resent-From: Christopher Lemmer Webber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 27 Apr 2020 19:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40417 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Kyle Meyer Cc: 40417@debbugs.gnu.org Received: via spool by 40417-submit@debbugs.gnu.org id=B40417.158801468222482 (code B ref 40417); Mon, 27 Apr 2020 19:12:02 +0000 Received: (at 40417) by debbugs.gnu.org; 27 Apr 2020 19:11:22 +0000 Received: from localhost ([127.0.0.1]:38169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT9A2-0005qX-4T for submit@debbugs.gnu.org; Mon, 27 Apr 2020 15:11:22 -0400 Received: from dustycloud.org ([50.116.34.160]:42042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jT9A0-0005qQ-UE for 40417@debbugs.gnu.org; Mon, 27 Apr 2020 15:11:21 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 10571265C7; Mon, 27 Apr 2020 15:11:20 -0400 (EDT) References: <875zegcq6w.fsf@dustycloud.org> <87k12w6v2p.fsf@kyleam.com> <874ktyc4ma.fsf@dustycloud.org> <87369h3o7f.fsf@kyleam.com> User-agent: mu4e 1.2.0; emacs 26.3 From: Christopher Lemmer Webber In-reply-to: <87369h3o7f.fsf@kyleam.com> Date: Mon, 27 Apr 2020 15:11:19 -0400 Message-ID: <87mu6wbv6w.fsf@dustycloud.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Kyle Meyer writes: > Christopher Lemmer Webber writes: > >> Kyle Meyer writes: > >>> It looks like emacs-magit uses a revision that follows the popup to >>> transient switch that happened after the 2.90.1 release. Magit-annex's >>> master branch has been updated to work with transient and will be >>> released along with the next release of Magit. >> >> That may explain why I had to manually insert the @ keybinding it >> supposedly should have done automatically. > > Correct. > >> I'm a little confused since I haven't been following magit though. >> "popup to transient switch"? > > Sorry, here's more context: Magit's popup interface used to be defined > with Magit-Popup. Jonas Bernoulli wrote Transient to replace > Magit-Popup [^1]. As of 1ed3febf (Merge branch 'transient' [#3728], > 2019-02-14), all of Magit's popups have been rewritten with Transient. > That change hasn't made it into a release yet, but it happened before > the revision that emacs-magit is built from. > > [^1]: https://emacsair.me/2019/02/14/transient-0.1/ Ok, revised patch. It works fine, though I am getting these errors: Compiling /gnu/store/3lc8vna2n2nhcdkfiqldg426ngjmzjnm-emacs-magit-annex-1.7.1-1.0bc9673/share/emacs/site-lisp/magit-annex-autoloads.el... In toplevel form: magit-annex-autoloads.el:10:45:Warning: reference to free variable ‘magit-mode-map’ In end of data: magit-annex-autoloads.el:60:1:Warning: the function ‘transient-append-suffix’ is not known to be defined. Compiling /gnu/store/3lc8vna2n2nhcdkfiqldg426ngjmzjnm-emacs-magit-annex-1.7.1-1.0bc9673/share/emacs/site-lisp/magit-annex.el... Loading /gnu/store/h9ihmqaf15vw70p6hxfqb4s48wwl5cn1-emacs-magit-2.90.1-3.c761d28/share/emacs/site-lisp/magit-version.el (source)... In end of data: magit-annex.el:834:1:Warning: the function ‘magit-log-setup-buffer’ is not known to be defined. Done (Total of 2 files compiled) That seems strange/alarming. Nonetheless, it seems to work fine... so not sure why we're getting that error then. One more question... emacs-xyz.scm seems inconsistent. We have both of these input styles: (propagated-inputs `(("magit" ,emacs-magit) ("transient" ,emacs-transient))) (propagated-inputs `(("emacs-magit" ,emacs-magit) ("emacs-transient" ,emacs-transient))) The latter is more common amongst the rest of Guix... anyone have a guess as to why we've got this variant of package input styles across Guix's Emacs packages tho? From 82f83b5ca6d955130f6e4a3324d54229d225556b Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Thu, 2 Apr 2020 15:03:27 -0400 Subject: [PATCH] gnu: Add emacs-magit-annex. * gnu/packages/emacs-xyz.scm (emacs-magit-annex): New variable. --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a0275cbe18..c56766047d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -475,6 +475,31 @@ these arguments. The prototypical use is for the command to call an external process, passing on the arguments as command line arguments.") (license license:gpl3+))) +(define-public emacs-magit-annex + (let ((commit "0bc96737634e78ac7c7f8a3f73190531c0890914") + (revision "1")) + (package + (name "emacs-magit-annex") + (version (git-version "1.7.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/magit-annex.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lm8412n2046fz8n7rfbadyww2074lsxq0w4gm1x1alraz5im5h4")))) + (build-system emacs-build-system) + (propagated-inputs + `(("magit" ,emacs-magit) + ("transient" ,emacs-transient))) + (home-page "https://github.com/magit/magit-annex/") + (synopsis "Git-annex support for Magit") + (description + "Magit-annex adds a few git-annex operations to the Magit interface.") + (license license:gpl3+)))) + (define-public emacs-minions (package (name "emacs-minions") -- 2.26.0