update packages
This commit is contained in:
@@ -398,11 +398,11 @@ recommended value."
|
||||
":" 'magit-git-command
|
||||
"r" 'magit-rebase
|
||||
"R" 'magit-file-rename
|
||||
"s" 'magit-stage-file
|
||||
"s" 'magit-stage-files
|
||||
"S" 'magit-stage-modified
|
||||
"t" 'magit-tag
|
||||
"T" 'magit-notes
|
||||
"u" 'magit-unstage-file
|
||||
"u" 'magit-unstage-files
|
||||
"U" 'magit-unstage-all
|
||||
"v" 'magit-revert-no-commit
|
||||
"V" 'magit-revert
|
||||
@@ -570,7 +570,7 @@ Magit is documented in info node `(magit)'."
|
||||
(magit-hack-dir-local-variables)
|
||||
(face-remap-add-relative 'header-line 'magit-header-line)
|
||||
(setq mode-line-process (magit-repository-local-get 'mode-line-process))
|
||||
(setq-local revert-buffer-function #'magit-refresh-buffer)
|
||||
(setq-local revert-buffer-function #'magit-revert-buffer)
|
||||
(setq-local bookmark-make-record-function #'magit--make-bookmark)
|
||||
(setq-local imenu-create-index-function #'magit--imenu-create-index)
|
||||
(setq-local imenu-default-goto-function #'magit--imenu-goto-function)
|
||||
@@ -662,7 +662,7 @@ The buffer's major-mode should derive from `magit-section-mode'."
|
||||
(magit-display-buffer buffer)
|
||||
(with-current-buffer buffer
|
||||
(run-hooks 'magit-setup-buffer-hook)
|
||||
(magit-refresh-buffer)
|
||||
(magit-refresh-buffer created)
|
||||
(when created
|
||||
(run-hooks 'magit-post-create-buffer-hook)))
|
||||
buffer))
|
||||
@@ -889,17 +889,7 @@ If a frame, then only consider buffers on that frame."
|
||||
(setq magit--default-directory default-directory)
|
||||
(setq magit-buffer-locked-p (and value t))
|
||||
(magit-restore-section-visibility-cache mode))
|
||||
(when magit-uniquify-buffer-names
|
||||
(cl-pushnew mode uniquify-list-buffers-directory-modes)
|
||||
(with-current-buffer buffer
|
||||
(setq list-buffers-directory (abbreviate-file-name default-directory)))
|
||||
(let ((uniquify-buffer-name-style
|
||||
(if (memq uniquify-buffer-name-style '(nil forward))
|
||||
'post-forward-angle-brackets
|
||||
uniquify-buffer-name-style)))
|
||||
(uniquify-rationalize-file-buffer-names
|
||||
name (file-name-directory (directory-file-name default-directory))
|
||||
buffer)))
|
||||
(magit--maybe-uniquify-buffer-names buffer name mode)
|
||||
buffer))
|
||||
|
||||
(defun magit-generate-buffer-name-default-function (mode &optional value)
|
||||
@@ -922,6 +912,19 @@ account."
|
||||
(?t . ,n)
|
||||
(?x . ,(if magit-uniquify-buffer-names "" "*"))))))
|
||||
|
||||
(defun magit--maybe-uniquify-buffer-names (buffer name mode)
|
||||
(when magit-uniquify-buffer-names
|
||||
(cl-pushnew mode uniquify-list-buffers-directory-modes)
|
||||
(with-current-buffer buffer
|
||||
(setq list-buffers-directory (abbreviate-file-name default-directory)))
|
||||
(let ((uniquify-buffer-name-style
|
||||
(if (memq uniquify-buffer-name-style '(nil forward))
|
||||
'post-forward-angle-brackets
|
||||
uniquify-buffer-name-style)))
|
||||
(uniquify-rationalize-file-buffer-names
|
||||
name (file-name-directory (directory-file-name default-directory))
|
||||
buffer))))
|
||||
|
||||
;;; Buffer Lock
|
||||
|
||||
(defun magit-toggle-buffer-lock ()
|
||||
@@ -947,16 +950,25 @@ latter is displayed in its place."
|
||||
(switch-to-buffer unlocked nil t)
|
||||
(kill-buffer locked))
|
||||
(setq magit-buffer-locked-p nil)
|
||||
(rename-buffer (funcall magit-generate-buffer-name-function
|
||||
major-mode)))
|
||||
(let ((name (funcall magit-generate-buffer-name-function major-mode))
|
||||
(buffer (current-buffer))
|
||||
(mode major-mode))
|
||||
(rename-buffer (generate-new-buffer-name name))
|
||||
(with-temp-buffer
|
||||
(magit--maybe-uniquify-buffer-names buffer name mode))))
|
||||
(if-let ((value (magit-buffer-value)))
|
||||
(if-let ((locked (magit-get-mode-buffer major-mode value)))
|
||||
(let ((unlocked (current-buffer)))
|
||||
(switch-to-buffer locked nil t)
|
||||
(kill-buffer unlocked))
|
||||
(setq magit-buffer-locked-p t)
|
||||
(rename-buffer (funcall magit-generate-buffer-name-function
|
||||
major-mode value)))
|
||||
(let ((name (funcall magit-generate-buffer-name-function
|
||||
major-mode value))
|
||||
(buffer (current-buffer))
|
||||
(mode major-mode))
|
||||
(rename-buffer (generate-new-buffer-name name))
|
||||
(with-temp-buffer
|
||||
(magit--maybe-uniquify-buffer-names buffer name mode))))
|
||||
(user-error "Buffer has no value it could be locked to"))))
|
||||
|
||||
;;; Bury Buffer
|
||||
@@ -1008,7 +1020,8 @@ window."
|
||||
Refresh the current buffer if its major mode derives from
|
||||
`magit-mode', and refresh the corresponding status buffer.
|
||||
|
||||
Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
|
||||
Run hooks `magit-pre-refresh-hook', `magit-post-refresh-hook'
|
||||
and `magit-unwind-refresh-hook'."
|
||||
(interactive)
|
||||
(unless magit-inhibit-refresh
|
||||
(unwind-protect
|
||||
@@ -1050,15 +1063,18 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
|
||||
(with-current-buffer buffer (magit-refresh-buffer)))
|
||||
(magit-run-hook-with-benchmark 'magit-post-refresh-hook))
|
||||
|
||||
(defvar-local magit-refresh-start-time nil)
|
||||
(defvar-local magit--refresh-start-time nil)
|
||||
|
||||
(defun magit-refresh-buffer (&rest _ignore)
|
||||
(defvar magit--initial-section-hook nil)
|
||||
|
||||
(defun magit-refresh-buffer (&optional created)
|
||||
"Refresh the current Magit buffer."
|
||||
(interactive)
|
||||
(setq magit-refresh-start-time (current-time))
|
||||
(let ((refresh (intern (format "%s-refresh-buffer"
|
||||
(substring (symbol-name major-mode) 0 -5))))
|
||||
(magit--refresh-cache (or magit--refresh-cache (list (cons 0 0)))))
|
||||
(let ((magit--refreshing-buffer-p t)
|
||||
(magit--refresh-start-time (current-time))
|
||||
(magit--refresh-cache (or magit--refresh-cache (list (cons 0 0))))
|
||||
(refresh (intern (format "%s-refresh-buffer"
|
||||
(substring (symbol-name major-mode) 0 -5)))))
|
||||
(when (functionp refresh)
|
||||
(when magit-refresh-verbose
|
||||
(message "Refreshing buffer `%s'..." (buffer-name)))
|
||||
@@ -1081,8 +1097,8 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
|
||||
(deactivate-mark)
|
||||
(setq magit-section-pre-command-section nil)
|
||||
(setq magit-section-highlight-overlays nil)
|
||||
(setq magit-section-selection-overlays nil)
|
||||
(setq magit-section-highlighted-sections nil)
|
||||
(setq magit-section-unhighlight-sections nil)
|
||||
(let ((inhibit-read-only t))
|
||||
(erase-buffer)
|
||||
(save-excursion
|
||||
@@ -1094,12 +1110,22 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
|
||||
(with-current-buffer buffer
|
||||
(let ((magit-section-movement-hook nil))
|
||||
(apply #'magit-section-goto-successor args)))))
|
||||
(when created
|
||||
(run-hooks 'magit--initial-section-hook)
|
||||
(setq-local magit--initial-section-hook nil))
|
||||
(let ((magit-section-cache-visibility nil))
|
||||
(magit-section-show magit-root-section))
|
||||
(run-hooks 'magit-refresh-buffer-hook)
|
||||
(magit-section-update-highlight)
|
||||
(set-buffer-modified-p nil))
|
||||
(set-buffer-modified-p nil)
|
||||
(push buffer magit-section--refreshed-buffers))
|
||||
(when magit-refresh-verbose
|
||||
(message "Refreshing buffer `%s'...done (%.3fs)" (buffer-name)
|
||||
(float-time (time-since magit-refresh-start-time)))))))
|
||||
(float-time (time-since magit--refresh-start-time)))))))
|
||||
|
||||
(defun magit-revert-buffer (_ignore-auto _noconfirm)
|
||||
"Wrapper around `magit-refresh-buffer' suitable as `revert-buffer-function'."
|
||||
(magit-refresh-buffer))
|
||||
|
||||
(defun magit-profile-refresh-buffer ()
|
||||
"Profile refreshing the current Magit buffer."
|
||||
@@ -1119,9 +1145,8 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'."
|
||||
(interactive)
|
||||
(require (quote elp))
|
||||
(cond ((catch 'in-progress
|
||||
(mapatoms (lambda (symbol)
|
||||
(and (get symbol elp-timer-info-property)
|
||||
(throw 'in-progress t)))))
|
||||
(mapatoms (##and (get % elp-timer-info-property)
|
||||
(throw 'in-progress t))))
|
||||
(message "Stop profiling and display results...")
|
||||
(elp-results)
|
||||
(elp-restore-all))
|
||||
@@ -1197,14 +1222,12 @@ argument (the prefix) non-nil means save all with no questions."
|
||||
(when-let ((topdir (magit-rev-parse-safe "--show-toplevel")))
|
||||
(let ((remote (file-remote-p default-directory))
|
||||
(save-some-buffers-action-alist
|
||||
`((?Y (lambda (buffer)
|
||||
(with-current-buffer buffer
|
||||
(setq buffer-save-without-query t)
|
||||
(save-buffer)))
|
||||
`((?Y ,(##with-current-buffer %
|
||||
(setq buffer-save-without-query t)
|
||||
(save-buffer))
|
||||
"to save the current buffer and remember choice")
|
||||
(?N (lambda (buffer)
|
||||
(with-current-buffer buffer
|
||||
(setq magit-inhibit-refresh-save t)))
|
||||
(?N ,(##with-current-buffer %
|
||||
(setq magit-inhibit-refresh-save t))
|
||||
"to skip the current buffer and remember choice")
|
||||
,@save-some-buffers-action-alist))
|
||||
(topdirs nil)
|
||||
|
||||
Reference in New Issue
Block a user