magit: Reconcile branch transient keys

My branch popup has a good number of key changes and custom commands.
Things got in a pretty bad state with the Transient switch.  Try to
fix that.

1 files changed, 13 insertions, 4 deletions

diff --git a/init.el b/init.el
index b8fb980..203acb1 100644
--- a/init.el
+++ b/init.el
@@ -999,12 +999,18 @@
   (transient-append-suffix 'magit-log-refresh "g"
     '("m" "Modify range" km/magit-log-modify-range))
 
+  (transient-suffix-put 'magit-branch "d" :key "D")
+  (transient-suffix-put 'magit-branch-configure "d" :key "D")
+  (transient-suffix-put 'magit-branch "r" :key "R")
+  (transient-suffix-put 'magit-branch-configure "r" :key "R")
+
+  (transient-suffix-put 'magit-branch "o" :key "O")
   (transient-suffix-put 'magit-branch "c" :key "o")
-  (transient-suffix-put 'magit-branch "C" :key "S")
   (transient-suffix-put 'magit-branch "n" :key "C")
-  (transient-suffix-put 'magit-branch "r" :key "R")
+  (transient-suffix-put 'magit-branch "s" :key "n")
+  (transient-suffix-put 'magit-branch "S" :key "N")
+  (transient-suffix-put 'magit-branch "C" :key "S")
   (transient-suffix-put 'magit-branch "m" :key "r")
-  (transient-suffix-put 'magit-branch "s" :key "v")
 
   (transient-suffix-put 'magit-push "u" :key "U")
   (transient-suffix-put 'magit-push "p" :key "P")
@@ -1177,7 +1183,10 @@
     '("d" "Copy branch" km/magit-branch-copy))
 
   (transient-append-suffix 'magit-branch "r"
-    '("s" "Backup current branch" km/magit-branch-checkpoint))
+    '("v" "Back up current branch, cp" km/magit-branch-checkpoint))
+
+  (transient-append-suffix 'magit-branch "v"
+    '("V" "Back up current branch, v" km/magit-branch-version))
 
   (transient-append-suffix 'magit-branch "c"
     '("m" "Checkout master" km/magit-checkout-master)))