Rename variables that still had "popup" in their names

Rename magit-branch-{popup-show-variables => direct-configure}.
Rename magit-remote-{popup-show-variables => direct-configure}.

3 files changed, 12 insertions, 6 deletions

diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index b5f13aa..1724e30 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -183,7 +183,7 @@ Another supported but obsolete value is `github-only'.  It is a
           (const :tag "... and rename corresponding branch on remote" t)
           (const :tag "... but only if remote is on a forge" forge-only)))
 
-(defcustom magit-branch-popup-show-variables t
+(defcustom magit-branch-direct-configure t
   "Whether the command `magit-branch' shows Git variables.
 When set to nil, no variables are displayed by this transient
 command, instead the sub-transient `magit-branch-configure'
@@ -206,7 +206,7 @@ has to be used to view and change branch related variables."
   :man-page "git-branch"
   ["Variables"
    :if (lambda ()
-         (and magit-branch-popup-show-variables
+         (and magit-branch-direct-configure
               (oref transient--prefix scope)))
    ("d" magit-branch.<branch>.description)
    ("u" magit-branch.<branch>.merge/remote)
@@ -747,7 +747,7 @@ and also rename the respective reflog file."
    ("a r" magit-branch.autoSetupRebase)]
   (interactive
    (list (or (and (not current-prefix-arg)
-                  (not (and magit-branch-popup-show-variables
+                  (not (and magit-branch-direct-configure
                             (eq current-transient-command 'magit-branch)))
                   (magit-get-current-branch))
              (magit--read-remote-scope))))
diff --git a/lisp/magit-obsolete.el b/lisp/magit-obsolete.el
index 9d11030..7488bf6 100644
--- a/lisp/magit-obsolete.el
+++ b/lisp/magit-obsolete.el
@@ -31,6 +31,12 @@
 
 ;;; Obsolete since v2.91.0
 
+(define-obsolete-variable-alias 'magit-branch-popup-show-variables
+  magit-branch-direct-configure "Magit 2.91.0")
+
+(define-obsolete-variable-alias 'magit-remote-popup-show-variables
+  magit-remote-direct-configure "Magit 2.91.0")
+
 (define-obsolete-function-alias 'magit-dispatch-popup
   'magit-dispatch "Magit 2.91.0")
 
diff --git a/lisp/magit-remote.el b/lisp/magit-remote.el
index 1f5bdcf..b9f15c1 100644
--- a/lisp/magit-remote.el
+++ b/lisp/magit-remote.el
@@ -46,7 +46,7 @@ variable isn't already set."
                  (string :tag "set if named")
                  (const  :tag "don't set")))
 
-(defcustom magit-remote-popup-show-variables t
+(defcustom magit-remote-direct-configure t
   "Whether the command `magit-remote' shows Git variables.
 When set to nil, no variables are displayed by this transient
 command, instead the sub-transient `magit-remote-configure'
@@ -90,7 +90,7 @@ values."
   :value '("-f")
   ["Variables"
    :if (lambda ()
-         (and magit-remote-popup-show-variables
+         (and magit-remote-direct-configure
               (oref transient--prefix scope)))
    ("u" magit-remote.<remote>.url)
    ("U" magit-remote.<remote>.fetch)
@@ -286,7 +286,7 @@ Delete the symbolic-ref \"refs/remotes/<remote>/HEAD\"."
    ("O" magit-remote.<remote>.tagopt)]
   (interactive
    (list (or (and (not current-prefix-arg)
-                  (not (and magit-remote-popup-show-variables
+                  (not (and magit-remote-direct-configure
                             (eq current-transient-command 'magit-remote)))
                   (magit-get-current-remote))
              (magit--read-remote-scope))))