aboutsummaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2015-08-30 18:52:30 +0300
committerAlex Kost <alezost@gmail.com>2015-09-01 13:03:51 +0300
commit761d6fd9c16801a13d1abe0a6951e793144ae791 (patch)
tree5f25344f84ad8a16184c8f1fa61586f0c21a0580 /emacs
parent32c0b6d78ce815350acf2f6879579d5b628c437f (diff)
downloadguix-761d6fd9c16801a13d1abe0a6951e793144ae791.tar
guix-761d6fd9c16801a13d1abe0a6951e793144ae791.tar.gz
emacs: Add "View graph" action to graph popup.
* emacs/guix-command.el: Require 'guix-external'. (guix-run-view-graph): New function. (guix-command-additional-execute-arguments, guix-command-special-executors): Add entries for "View graph" action.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-command.el18
1 files changed, 16 insertions, 2 deletions
diff --git a/emacs/guix-command.el b/emacs/guix-command.el
index 139724d3d5..3513300576 100644
--- a/emacs/guix-command.el
+++ b/emacs/guix-command.el
@@ -65,6 +65,7 @@
(require 'guix-help-vars)
(require 'guix-read)
(require 'guix-base)
+(require 'guix-external)
(defgroup guix-commands nil
"Settings for guix popup windows."
@@ -490,7 +491,9 @@ to be modified."
"List of default 'execute' action arguments.")
(defvar guix-command-additional-execute-arguments
- nil
+ `((("graph")
+ ,(guix-command-make-argument
+ :name "view" :char ?v :doc "View graph")))
"Alist of guix commands and additional 'execute' action arguments.")
(defun guix-command-execute-arguments (commands)
@@ -508,7 +511,9 @@ to be modified."
'((("environment")
("repl" . guix-run-environment-command-in-repl))
(("pull")
- ("repl" . guix-run-pull-command-in-repl)))
+ ("repl" . guix-run-pull-command-in-repl))
+ (("graph")
+ ("view" . guix-run-view-graph)))
"Alist of guix commands and alists of special executers for them.
See also `guix-command-default-executors'.")
@@ -545,6 +550,15 @@ Perform pull-specific actions after operation, see
(apply #'guix-make-guile-expression 'guix-command args)
nil 'pull))
+(defun guix-run-view-graph (args)
+ "Run 'guix ARGS ...' graph command, make the image and open it."
+ (let* ((graph-file (guix-dot-file-name))
+ (dot-args (guix-dot-arguments graph-file)))
+ (if (guix-eval-read (guix-make-guile-expression
+ 'pipe-guix-output args dot-args))
+ (guix-find-file graph-file)
+ (error "Couldn't create a graph"))))
+
;;; Generating popups, actions, etc.