-
Notifications
You must be signed in to change notification settings - Fork 9
Expand file tree
/
Copy pathmajutsu-revert.el
More file actions
178 lines (156 loc) · 5.92 KB
/
majutsu-revert.el
File metadata and controls
178 lines (156 loc) · 5.92 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
;;; majutsu-revert.el --- Revert transient for Majutsu -*- lexical-binding: t; -*-
;; Copyright (C) 2026 0WD0
;; Author: 0WD0 <wd.1105848296@gmail.com>
;; Maintainer: 0WD0 <wd.1105848296@gmail.com>
;; Keywords: tools, vc
;; URL: https://github.com/0WD0/majutsu
;; SPDX-License-Identifier: GPL-3.0-or-later
;;; Commentary:
;; This library provides jj revert transients, managing source
;; revision selection and destination placement.
;;; Code:
(require 'majutsu)
(require 'majutsu-selection)
(defclass majutsu-revert-option (majutsu-selection-option)
())
(defclass majutsu-revert--toggle-option (majutsu-selection-toggle-option)
())
(defun majutsu-revert-arguments ()
"Return the current revert arguments.
If inside the transient, return transient args unchanged.
Otherwise, if point is on a revision and args are missing source or
destination, fill with --revisions and --insert-after defaults."
(let* ((inside-transient (eq transient-current-command 'majutsu-revert))
(args (if inside-transient
(transient-args 'majutsu-revert)
'())))
(unless inside-transient
(when-let* ((rev (magit-section-value-if 'jj-commit)))
(unless (seq-some (lambda (arg)
(string-prefix-p "--revisions=" arg))
args)
(setq args (append args (list (concat "--revisions=" rev)))))
(unless (seq-some (lambda (arg)
(or (string-prefix-p "--onto=" arg)
(string-prefix-p "--insert-after=" arg)
(string-prefix-p "--insert-before=" arg)))
args)
(setq args (append args (list (concat "--insert-after=" rev)))))))
args))
;;;###autoload
(defun majutsu-revert-execute (args)
"Execute jj revert with ARGS from the transient."
(interactive (list (majutsu-revert-arguments)))
(let ((has-revision (seq-some (lambda (arg)
(string-prefix-p "--revisions=" arg))
args))
(has-destination (seq-some (lambda (arg)
(or (string-prefix-p "--onto=" arg)
(string-prefix-p "--insert-after=" arg)
(string-prefix-p "--insert-before=" arg)))
args)))
(cond
((not has-revision)
(majutsu--message-with-log "Please select source revisions (-r) first"))
((not has-destination)
(majutsu--message-with-log "Please select destination (-o/-A/-B) first"))
((zerop (apply #'majutsu-run-jj "revert" args))
(message "Revert completed")))))
;;; Revert transient
(transient-define-argument majutsu-revert:--revisions ()
:description "Revisions"
:class 'majutsu-revert-option
:selection-label "[REVS]"
:selection-face '(:background "goldenrod" :foreground "black")
:key "-r"
:argument "--revisions="
:multi-value 'repeat
:reader #'majutsu-diff--transient-read-revset)
(transient-define-argument majutsu-revert:--onto ()
:description "Onto"
:class 'majutsu-revert-option
:selection-label "[ONTO]"
:selection-face '(:background "dark green" :foreground "white")
:key "-o"
:argument "--onto="
:multi-value 'repeat
:reader #'majutsu-diff--transient-read-revset)
(transient-define-argument majutsu-revert:--insert-after ()
:description "Insert after"
:class 'majutsu-revert-option
:selection-label "[AFTER]"
:selection-face '(:background "dark blue" :foreground "white")
:key "-A"
:argument "--insert-after="
:multi-value 'repeat
:reader #'majutsu-diff--transient-read-revset)
(transient-define-argument majutsu-revert:--insert-before ()
:description "Insert before"
:class 'majutsu-revert-option
:selection-label "[BEFORE]"
:selection-face '(:background "dark magenta" :foreground "white")
:key "-B"
:argument "--insert-before="
:multi-value 'repeat
:reader #'majutsu-diff--transient-read-revset)
(transient-define-argument majutsu-revert:revisions ()
:description "Revisions (toggle at point)"
:class 'majutsu-revert--toggle-option
:key "r"
:argument "--revisions="
:multi-value 'repeat)
(transient-define-argument majutsu-revert:onto ()
:description "Onto (toggle at point)"
:class 'majutsu-revert--toggle-option
:key "o"
:argument "--onto="
:multi-value 'repeat)
(transient-define-argument majutsu-revert:insert-after ()
:description "Insert after (toggle at point)"
:class 'majutsu-revert--toggle-option
:key "a"
:argument "--insert-after="
:multi-value 'repeat)
(transient-define-argument majutsu-revert:insert-before ()
:description "Insert before (toggle at point)"
:class 'majutsu-revert--toggle-option
:key "b"
:argument "--insert-before="
:multi-value 'repeat)
;;;###autoload(autoload 'majutsu-revert "majutsu-revert" nil t)
(transient-define-prefix majutsu-revert ()
"Transient for jj revert operations."
:man-page "jj-revert"
:incompatible '(("--onto=" "--insert-after=")
("--onto=" "--insert-before=")
("--insert-after=" "--insert-before="))
:transient-non-suffix t
[:description "JJ Revert"
:class transient-columns
["Selection"
(majutsu-revert:--revisions)
(majutsu-revert:revisions)
("c" "Clear selections" majutsu-selection-clear
:transient t)]
["Destination"
(majutsu-revert:--onto)
(majutsu-revert:--insert-after)
(majutsu-revert:--insert-before)
(majutsu-revert:onto)
(majutsu-revert:insert-after)
(majutsu-revert:insert-before)]
["Options"
(majutsu-transient-arg-ignore-immutable)]
["Actions"
("_" "Revert" majutsu-revert-execute)
("V" "Revert" majutsu-revert-execute)
("RET" "Revert" majutsu-revert-execute)
("q" "Quit" transient-quit-one)]]
(interactive)
(transient-setup
'majutsu-revert nil nil
:scope
(majutsu-selection-session-begin)))
;;; _
(provide 'majutsu-revert)
;;; majutsu-revert.el ends here