aboutsummaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2014-10-05 12:31:23 +0400
committerAlex Kost <alezost@gmail.com>2014-10-06 00:02:46 +0400
commitcb6a5c71d875fff6f1c3b2bd1e43c31cc7cfe1ac (patch)
tree8413cb2e9398785ea4e886ac087bc8bb80ca1c03 /emacs
parentd3d337d2d8f7152cb9ff3724f1cf240ce5ea5be2 (diff)
downloadguix-cb6a5c71d875fff6f1c3b2bd1e43c31cc7cfe1ac.tar
guix-cb6a5c71d875fff6f1c3b2bd1e43c31cc7cfe1ac.tar.gz
emacs: Add support for deleting generations.
* doc/emacs.texi (emacs List buffer): Mention new key bindings. * emacs/guix-base.el (guix-delete-generations): New procedure. * emacs/guix-info.el (guix-generation-info-insert-number): Use it. * emacs/guix-list.el (guix-generation-list-mark-delete, guix-generation-list-execute): New procedures. * emacs/guix-main.scm (delete-generations*): New procedure.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-base.el14
-rw-r--r--emacs/guix-info.el6
-rw-r--r--emacs/guix-list.el19
-rw-r--r--emacs/guix-main.scm6
4 files changed, 42 insertions, 3 deletions
diff --git a/emacs/guix-base.el b/emacs/guix-base.el
index 8da7835b79..d31fb79a0a 100644
--- a/emacs/guix-base.el
+++ b/emacs/guix-base.el
@@ -801,6 +801,20 @@ Return non-nil, if the operation should be continued; nil otherwise."
guix-operation-option-separator)))
(force-mode-line-update))
+(defun guix-delete-generations (&rest generations)
+ "Delete GENERATIONS.
+Each element from GENERATIONS is a generation number."
+ (when (or (not guix-operation-confirm)
+ (y-or-n-p
+ (let ((count (length generations)))
+ (if (> count 1)
+ (format "Delete %d generations? " count)
+ (format "Delete generation number %d? "
+ (car generations))))))
+ (guix-eval-in-repl
+ (guix-make-guile-expression
+ 'delete-generations* guix-current-profile generations))))
+
(provide 'guix-base)
;;; guix-base.el ends here
diff --git a/emacs/guix-info.el b/emacs/guix-info.el
index d0a320f7cf..d5226b1286 100644
--- a/emacs/guix-info.el
+++ b/emacs/guix-info.el
@@ -627,8 +627,10 @@ ENTRY is an alist with package info."
(guix-info-insert-indent)
(guix-info-insert-action-button
"Delete"
- (lambda (btn) (error "Sorry, not implemented yet"))
- "Delete this generation"))
+ (lambda (btn)
+ (guix-delete-generations (button-get btn 'number)))
+ "Delete this generation"
+ 'number number))
(provide 'guix-info)
diff --git a/emacs/guix-list.el b/emacs/guix-list.el
index 6a4cdfc552..4b4b9c5396 100644
--- a/emacs/guix-list.el
+++ b/emacs/guix-list.el
@@ -728,8 +728,9 @@ Also see `guix-package-info-type'."
(let ((map guix-generation-list-mode-map))
(define-key map (kbd "RET") 'guix-generation-list-show-packages)
+ (define-key map (kbd "x") 'guix-generation-list-execute)
(define-key map (kbd "i") 'guix-list-describe)
- (define-key map (kbd "d") 'guix-generation-list-mark-delete-simple))
+ (define-key map (kbd "d") 'guix-generation-list-mark-delete))
(defun guix-generation-list-show-packages ()
"List installed packages for the generation at point."
@@ -737,6 +738,22 @@ Also see `guix-package-info-type'."
(guix-get-show-entries 'list guix-package-list-type 'generation
(guix-list-current-id)))
+(defun guix-generation-list-mark-delete (&optional arg)
+ "Mark the current generation for deletion and move to the next line.
+With ARG, mark all generations for deletion."
+ (interactive "P")
+ (if arg
+ (guix-list-mark-all 'delete)
+ (guix-list-mark 'delete t)))
+
+(defun guix-generation-list-execute ()
+ "Delete marked generations."
+ (interactive)
+ (let ((marked (guix-list-get-marked-id-list 'delete)))
+ (or marked
+ (user-error "No generations marked for deletion"))
+ (apply #'guix-delete-generations marked)))
+
(provide 'guix-list)
;;; guix-list.el ends here
diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm
index 026a9e98e7..7dbfa61b6f 100644
--- a/emacs/guix-main.scm
+++ b/emacs/guix-main.scm
@@ -815,3 +815,9 @@ OUTPUTS is a list of package outputs (may be an empty list)."
"~a packages in profile~%"
count)
count)))))))))
+
+(define (delete-generations* profile generations)
+ "Delete GENERATIONS from PROFILE.
+GENERATIONS is a list of generation numbers."
+ (with-store store
+ (delete-generations store profile generations)))