Commit a142b770 authored by Artur Malabarba's avatar Artur Malabarba
Browse files

* lisp/emacs-lisp/package.el: Revert buffer after any operation

Call `package-menu--post-refresh' after any operation that changes
the package database (`package-install' and `package-delete').  To
avoid performance issues in large transactions, these functions
add `post-refresh' to `post-command-hook' instead of calling it
immediately.
(package-menu--mark-or-notify-upgrades): New function.
(list-packages): Add it to `package--post-download-archives-hook'.
(package-menu--post-refresh): Lose the upgrade-checking code, add
code to remove itself from `post-command-hook'.
(package-install, package-delete): Add it to `post-command-hook'.
(package-menu-execute): Don't call `package-menu--post-refresh'.
parent 4b161376
...@@ -1873,6 +1873,7 @@ to install it but still mark it as selected." ...@@ -1873,6 +1873,7 @@ to install it but still mark it as selected."
package-archive-contents)) package-archive-contents))
nil t)) nil t))
nil))) nil)))
(add-hook 'post-command-hook #'package-menu--post-refresh)
(let ((name (if (package-desc-p pkg) (let ((name (if (package-desc-p pkg)
(package-desc-name pkg) (package-desc-name pkg)
pkg))) pkg)))
...@@ -2037,6 +2038,7 @@ If NOSAVE is non-nil, the package is not removed from ...@@ -2037,6 +2038,7 @@ If NOSAVE is non-nil, the package is not removed from
(package-desc-full-name pkg-desc) (package-desc-full-name pkg-desc)
(package-desc-name pkg-used-elsewhere-by))) (package-desc-name pkg-used-elsewhere-by)))
(t (t
(add-hook 'post-command-hook #'package-menu--post-refresh)
(delete-directory dir t t) (delete-directory dir t t)
;; Remove NAME-VERSION.signed file. ;; Remove NAME-VERSION.signed file.
(let ((signed-file (concat dir ".signed"))) (let ((signed-file (concat dir ".signed")))
...@@ -3059,9 +3061,7 @@ Optional argument NOQUERY non-nil means do not ask the user to confirm." ...@@ -3059,9 +3061,7 @@ Optional argument NOQUERY non-nil means do not ask the user to confirm."
(length removable) (length removable)
"are no longer needed, type `M-x package-autoremove' to remove them") "are no longer needed, type `M-x package-autoremove' to remove them")
(message (replace-regexp-in-string "__" "ed" message-template) (message (replace-regexp-in-string "__" "ed" message-template)
"finished")))) "finished"))))))))
;; This calls `package-menu--generate'.
(package-menu--post-refresh)))))
(defun package-menu--version-predicate (A B) (defun package-menu--version-predicate (A B)
(let ((vA (or (aref (cadr A) 1) '(0))) (let ((vA (or (aref (cadr A) 1) '(0)))
...@@ -3135,15 +3135,30 @@ Store this list in `package-menu--new-package-list'." ...@@ -3135,15 +3135,30 @@ Store this list in `package-menu--new-package-list'."
(if (= (length upgrades) 1) "it" "them")))) (if (= (length upgrades) 1) "it" "them"))))
(defun package-menu--post-refresh () (defun package-menu--post-refresh ()
"Check for new packages, revert the *Packages* buffer, and check for upgrades. "If there's a *Packages* buffer, revert it and check for new packages and upgrades.
This function is called after `package-refresh-contents' and Do nothing if there's no *Packages* buffer.
after `package-menu--perform-transaction'."
(package-menu--populate-new-package-list) This function is called after `package-refresh-contents' and it
is added to `post-command-hook' by any function which alters the
package database (`package-install' and `package-delete'). When
run, it removes itself from `post-command-hook'."
(remove-hook 'post-command-hook #'package-menu--post-refresh)
(let ((buf (get-buffer "*Packages*"))) (let ((buf (get-buffer "*Packages*")))
(when (buffer-live-p buf) (when (buffer-live-p buf)
(with-current-buffer buf (with-current-buffer buf
(package-menu--populate-new-package-list)
(run-hooks 'tabulated-list-revert-hook) (run-hooks 'tabulated-list-revert-hook)
(tabulated-list-print 'remember 'update) (tabulated-list-print 'remember 'update)))))
(defun package-menu--mark-or-notify-upgrades ()
"If there's a *Packages* buffer, check for upgrades and possibly mark them.
Do nothing if there's no *Packages* buffer. If there are
upgrades, mark them if `package-menu--mark-upgrades-pending' is
non-nil, otherwise just notify the user that there are upgrades.
This function is called after `package-refresh-contents'."
(let ((buf (get-buffer "*Packages*")))
(when (buffer-live-p buf)
(with-current-buffer buf
(if package-menu--mark-upgrades-pending (if package-menu--mark-upgrades-pending
(package-menu--mark-upgrades-1) (package-menu--mark-upgrades-1)
(package-menu--find-and-notify-upgrades)))))) (package-menu--find-and-notify-upgrades))))))
...@@ -3162,6 +3177,8 @@ The list is displayed in a buffer named `*Packages*'." ...@@ -3162,6 +3177,8 @@ The list is displayed in a buffer named `*Packages*'."
;; Integrate the package-menu with updating the archives. ;; Integrate the package-menu with updating the archives.
(add-hook 'package--post-download-archives-hook (add-hook 'package--post-download-archives-hook
#'package-menu--post-refresh) #'package-menu--post-refresh)
(add-hook 'package--post-download-archives-hook
#'package-menu--mark-or-notify-upgrades 'append)
;; Generate the Package Menu. ;; Generate the Package Menu.
(let ((buf (get-buffer-create "*Packages*"))) (let ((buf (get-buffer-create "*Packages*")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment