magit-buffer-refname: Convert to alias for magit-buffer-revision

6 files changed, 15 insertions, 20 deletions

diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el
index 34c1fa4..c9dc1d9 100644
--- a/lisp/magit-blame.el
+++ b/lisp/magit-blame.el
@@ -261,7 +261,7 @@ Also see option `magit-blame-styles'."
   (or (and (not (and type (not (eq type magit-blame-type))))
            (magit-blame-chunk-at (point)))
       (and type
-           (let ((rev  (or magit-buffer-refname magit-buffer-revision))
+           (let ((rev magit-buffer-revision)
                  (file (and (not (derived-mode-p 'dired-mode))
                             (magit-file-relative-name
                              nil (not magit-buffer-file-name))))
@@ -418,8 +418,8 @@ modes is toggled, then this mode also gets toggled automatically.
       (magit-blame-mode 1))
     (message "Blaming...")
     (magit-blame-run-process
-     (and$ (or magit-buffer-refname magit-buffer-revision)
-           (and (not (equal $ "{index}")) $))
+     (and (not (equal magit-buffer-revision "{index}"))
+          magit-buffer-revision)
      (magit-file-relative-name nil (not magit-buffer-file-name))
      (if (memq magit-blame-type '(final removal))
          (cons "--reverse" args)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 211593f..4e1a46d 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -1199,8 +1199,6 @@ If no DWIM context is found, nil is returned."
     ([commits (magit-region-values '(commit branch) t)]
      (deactivate-mark)
      (concat (car (last commits)) ".." (car commits)))
-    (magit-buffer-refname
-     (cons 'commit magit-buffer-refname))
     ((derived-mode-p 'magit-stash-mode)
      (cons 'commit
            (magit-section-case
@@ -1212,7 +1210,7 @@ If no DWIM context is found, nil is returned."
                      (oref parent)
                      (oref parent)
                      (oref value))))))
-    ((derived-mode-p 'magit-revision-mode)
+    (magit-buffer-revision
      (cons 'commit magit-buffer-revision))
     ((derived-mode-p 'magit-diff-mode)
      (pcase-exhaustive magit-buffer-diff-type
@@ -1361,8 +1359,8 @@ the file or blob."
   (interactive)
   (require 'magit)
   (if-let ((file (magit-file-relative-name)))
-      (if magit-buffer-refname
-          (magit-show-commit magit-buffer-refname
+      (if magit-buffer-revision
+          (magit-show-commit magit-buffer-revision
                              (car (magit-show-commit--arguments))
                              (list file))
         (save-buffer)
diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index e3e6021..3165d08 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -131,7 +131,6 @@ A non-nil value for REVERT is ignored if REV is \"{worktree}\"."
                                        (buffer-name))))
                  revert)
          (setq magit-buffer-revision rev)
-         (setq magit-buffer-refname rev)
          (setq magit-buffer-file-name file)
          (setq default-directory (if (file-exists-p defdir) defdir topdir))
          (setq-local revert-buffer-function #'magit-revert-rev-file-buffer)
@@ -157,18 +156,18 @@ A non-nil value for REVERT is ignored if REV is \"{worktree}\"."
                      (when (string-match regexp magit-buffer-file-name)
                        (throw 'found t)))))
             (yes-or-no-p (format "Revert buffer from Git %s? "
-                                 (if (equal magit-buffer-refname "{index}")
+                                 (if (equal magit-buffer-revision "{index}")
                                      "index"
-                                   (concat "revision " magit-buffer-refname)))))
+                                   (concat "revision " magit-buffer-revision)))))
     (let* ((inhibit-read-only t)
            (default-directory (magit-toplevel))
            (file (file-relative-name magit-buffer-file-name))
            (coding-system-for-read (or coding-system-for-read 'undecided)))
       (erase-buffer)
       (magit-git-insert "cat-file" "-p"
-                        (if (equal magit-buffer-refname "{index}")
+                        (if (equal magit-buffer-revision "{index}")
                             (concat ":" file)
-                          (concat magit-buffer-refname ":" file)))
+                          (concat magit-buffer-revision ":" file)))
       (setq buffer-file-coding-system last-coding-system-used))
     (let ((buffer-file-name magit-buffer-file-name)
           (after-change-major-mode-hook
@@ -207,7 +206,7 @@ The current buffer has to be visiting a file in the index, which
 is done using `magit-find-index-noselect'."
   (interactive)
   (let ((file (magit-file-relative-name)))
-    (unless (equal magit-buffer-refname "{index}")
+    (unless (equal magit-buffer-revision "{index}")
       (user-error "%s isn't visiting the index" file))
     (if (y-or-n-p (format "Update index with contents of %s?" (buffer-name)))
         (let ((index (make-temp-name
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index 023b485..7475171 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -48,7 +48,6 @@
 (defvar magit-buffer-file-name)
 (defvar magit-buffer-log-args)
 (defvar magit-buffer-log-files)
-(defvar magit-buffer-refname)
 (defvar magit-buffer-revision)
 
 ;; From `magit-process'.
@@ -1682,7 +1681,7 @@ to, or to some other symbolic-ref that points to the same ref."
                             (magit-current-blame-chunk))))
         (oref chunk orig-rev))
       (and magit-buffer-file-name
-           magit-buffer-refname)
+           magit-buffer-revision)
       (and (derived-mode-p 'magit-stash-mode
                            'magit-merge-preview-mode
                            'magit-revision-mode)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 62af897..83f6c25 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -779,7 +779,7 @@ restrict the log to the lines that the region touches."
   (require 'magit)
   (if-let ((file (magit-file-relative-name)))
       (magit-log-setup-buffer
-       (list (or magit-buffer-refname
+       (list (or magit-buffer-revision
                  (magit-get-current-branch)
                  "HEAD"))
        (let ((args (car (magit-log-arguments))))
@@ -802,7 +802,7 @@ restrict the log to the lines that the region touches."
                          (user-error "Buffer isn't visiting a file"))
                      (or (funcall magit-log-trace-definition-function)
                          (user-error "No function at point found"))
-                     (or magit-buffer-refname
+                     (or magit-buffer-revision
                          (magit-get-current-branch)
                          "HEAD")))
   (require 'magit)
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index 98114ae..87ed1f4 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -578,13 +578,12 @@ Magit is documented in info node `(magit)'."
 
 ;;; Local Variables
 
-(defvar-local magit-buffer-refname nil)
+(defvaralias 'magit-buffer-refname 'magit-buffer-revision)
 (defvar-local magit-buffer-revision nil)
 (defvar-local magit-buffer-revision-oid nil)
 (defvar-local magit-buffer-file-name nil)
 
 ;; Preserve when major-mode is changed in file-visiting buffers.
-(put 'magit-buffer-refname 'permanent-local t)
 (put 'magit-buffer-revision 'permanent-local t)
 (put 'magit-buffer-revision-oid 'permanent-local t)
 (put 'magit-buffer-file-name 'permanent-local t)