1 00713762 2021-08-17 op ;;; vc-got.el --- VC backend for Game of Trees VCS -*- lexical-binding: t; -*-
3 e104d04c 2021-08-17 op ;; Copyright (C) 2020, 2021 Omar Polo
5 76d978fa 2021-01-05 op ;; Author: Omar Polo <op@omarpolo.com>
6 d3ca33b4 2021-08-16 op ;; URL: https://git.omarpolo.com/vc-got/
7 61b9a83b 2021-08-17 op ;; Keywords: vc tools
9 d3ca33b4 2021-08-16 op ;; Package-Requires: ((emacs "27.1"))
11 406d7b4d 2020-12-26 op ;; This program is free software; you can redistribute it and/or modify
12 406d7b4d 2020-12-26 op ;; it under the terms of the GNU General Public License as published by
13 406d7b4d 2020-12-26 op ;; the Free Software Foundation, either version 3 of the License, or
14 406d7b4d 2020-12-26 op ;; (at your option) any later version.
16 406d7b4d 2020-12-26 op ;; This program is distributed in the hope that it will be useful,
17 406d7b4d 2020-12-26 op ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18 406d7b4d 2020-12-26 op ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 406d7b4d 2020-12-26 op ;; GNU General Public License for more details.
21 406d7b4d 2020-12-26 op ;; You should have received a copy of the GNU General Public License
22 406d7b4d 2020-12-26 op ;; along with this program. If not, see <https://www.gnu.org/licenses/>.
24 7726b6c9 2021-08-10 op ;;; Commentary:
26 186da174 2021-08-17 op ;; This file contains a VC backend for the Game of Trees (got) version
27 186da174 2021-08-17 op ;; control system.
29 af5ef7cd 2020-11-29 op ;; Backend implementation status
31 af5ef7cd 2020-11-29 op ;; Function marked with `*' are required, those with `-' are optional.
33 af5ef7cd 2020-11-29 op ;; FUNCTION NAME STATUS
35 af5ef7cd 2020-11-29 op ;; BACKEND PROPERTIES:
36 af5ef7cd 2020-11-29 op ;; * revision-granularity DONE
37 af5ef7cd 2020-11-29 op ;; - update-on-retrieve-tag XXX: what should this do?
39 af5ef7cd 2020-11-29 op ;; STATE-QUERYING FUNCTIONS:
40 af5ef7cd 2020-11-29 op ;; * registered DONE
41 af5ef7cd 2020-11-29 op ;; * state DONE
42 af5ef7cd 2020-11-29 op ;; - dir-status-files DONE
43 a8466f02 2020-12-07 op ;; - dir-extra-headers DONE
44 2d83de2e 2021-01-05 op ;; - dir-printer DONE
45 af5ef7cd 2020-11-29 op ;; - status-fileinfo-extra NOT IMPLEMENTED
46 af5ef7cd 2020-11-29 op ;; * working-revision DONE
47 af5ef7cd 2020-11-29 op ;; * checkout-model DONE
48 694534b4 2020-12-05 op ;; - mode-line-string DONE
50 23a0b465 2020-11-30 op ;; STATE-CHANGING FUNCTIONS:
51 23a0b465 2020-11-30 op ;; * create-repo NOT IMPLEMENTED
52 eb85ad27 2020-12-05 op ;; I don't think got init does what this function is supposed to
54 23a0b465 2020-11-30 op ;; * register DONE
55 23a0b465 2020-11-30 op ;; - responsible-p DONE
56 3cdb0759 2020-01-03 47739920+ ;; - receive-file NOT NEEDED, default `register' works fine
57 241a3b12 2021-08-11 op ;; - unregister DONE
58 23a0b465 2020-11-30 op ;; * checkin DONE
59 23a0b465 2020-11-30 op ;; * find-revision DONE
60 eb85ad27 2020-12-05 op ;; * checkout NOT IMPLEMENTED
61 eb85ad27 2020-12-05 op ;; I'm not sure how to properly implement this. Does filling
62 eb85ad27 2020-12-05 op ;; FILE with the find-revision do the trick? Or use got update?
63 eb85ad27 2020-12-05 op ;; * revert DONE
64 eb85ad27 2020-12-05 op ;; - merge-file NOT IMPLEMENTED
65 eb85ad27 2020-12-05 op ;; - merge-branch DONE
66 eb85ad27 2020-12-05 op ;; - merge-news NOT IMPLEMENTED
67 eb85ad27 2020-12-05 op ;; - pull DONE
68 686eac9a 2020-12-07 op ;; - push DONE
70 3cdb0759 2020-01-03 47739920+ ;; - steal-lock NOT NEEDED, `got' is not using locks
71 eb85ad27 2020-12-05 op ;; - modify-change-comment NOT IMPLEMENTED
72 eb85ad27 2020-12-05 op ;; can be implemented via histedit, if I understood correctly
73 eb85ad27 2020-12-05 op ;; what it is supposed to do.
74 ae2ad572 2021-08-17 op ;; - mark-resolved NOT NEEDED
75 ae2ad572 2021-08-17 op ;; got notice by itself when a file doesn't have any pending
76 ae2ad572 2021-08-17 op ;; conflicts to be resolved.
77 ae2ad572 2021-08-17 op ;; - find-admin-dir NOT NEEDED
79 eb85ad27 2020-12-05 op ;; HISTORY FUNCTIONS
80 eb85ad27 2020-12-05 op ;; * print-log DONE
81 9ad1eb5d 2020-12-07 op ;; * log-outgoing DONE
82 6eda2f1f 2020-12-26 op ;; * log-incoming DONE
83 eb85ad27 2020-12-05 op ;; - log-search DONE
84 0a3316a6 2021-02-22 op ;; - log-view-mode DONE
85 6eda2f1f 2020-12-26 op ;; - show-log-entry NOT IMPLEMENTED
86 6eda2f1f 2020-12-26 op ;; - comment-history NOT IMPLEMENTED
87 6eda2f1f 2020-12-26 op ;; - update-changelog NOT IMPLEMENTED
88 7c257a7b 2020-12-31 noreply ;; * diff DONE
89 5fb2f474 2021-08-10 op ;; - revision-completion-table DONE
90 3f25d9ff 2020-01-02 noreply ;; - annotate-command DONE
91 3f25d9ff 2020-01-02 noreply ;; - annotate-time DONE
92 424f5152 2021-08-10 op ;; - annotate-current-time NOT NEEDED
93 424f5152 2021-08-10 op ;; the default time handling is enough.
94 3f25d9ff 2020-01-02 noreply ;; - annotate-extract-revision-at-line DONE
95 7c257a7b 2020-12-31 noreply ;; - region-history NOT IMPLEMENTED
96 7c257a7b 2020-12-31 noreply ;; - region-history-mode NOT IMPLEMENTED
97 7c257a7b 2020-12-31 noreply ;; - mergebase NOT IMPLEMENTED
99 7c257a7b 2020-12-31 noreply ;; TAG SYSTEM
100 6ab1c7b4 2021-08-11 op ;; - create-tag DONE
101 09d59379 2021-08-11 op ;; - retrieve-tag DONE
103 7c257a7b 2020-12-31 noreply ;; MISCELLANEOUS NOT IMPLEMENTED
104 3cdb0759 2020-01-03 47739920+ ;; - make-version-backups-p NOT NEEDED, `got' works fine locally
105 7c257a7b 2020-12-31 noreply ;; - root DONE
106 49945a03 2021-08-11 op ;; - ignore NOT NEEDED, the default action is good
107 49945a03 2021-08-11 op ;; - ignore-completion-table NOT NEEDED, the default action is good
108 2552a6c7 2021-08-11 op ;; - find-ignore-file DONE
109 3f25d9ff 2020-01-02 noreply ;; - previous-revision DONE
110 3f25d9ff 2020-01-02 noreply ;; - next-revision DONE
111 7c257a7b 2020-12-31 noreply ;; - log-edit-mode NOT IMPLEMENTED
112 3cdb0759 2020-01-03 47739920+ ;; - check-headers NOT NEEDED, `got' does not use headers
113 a96df0e8 2020-01-03 noreply ;; - delete-file DONE
114 3cdb0759 2020-01-03 47739920+ ;; - rename-file NOT NEEDED, `delete' + `register' is enough
115 c151c257 2021-08-03 op ;; - find-file-hook DONE
116 3cdb0759 2020-01-03 47739920+ ;; - extra-menu NOT IMPLEMENTED, add `import', `integrate', `stage'?
117 3cdb0759 2020-01-03 47739920+ ;; - extra-dir-menu NOT IMPLEMENTED, same as above
118 7bb16f79 2020-01-03 op ;; - conflicted-files DONE
119 8b635a9f 2020-01-03 op ;; - repository-url DONE
121 eb85ad27 2020-12-05 op ;; TODO: vc-git has most function that starts with:
123 eb85ad27 2020-12-05 op ;; (let* ((root (vc-git-root default-directory))
124 eb85ad27 2020-12-05 op ;; (buffer (format "*vc-git : %s*" (expand-file-name root)))
128 eb85ad27 2020-12-05 op ;; we should 1) investigate if also other backends do something like
129 eb85ad27 2020-12-05 op ;; this (or if there is a better way) and 2) try to do the same.
133 af5ef7cd 2020-11-29 op (eval-when-compile
134 af5ef7cd 2020-11-29 op (require 'subr-x))
136 af5ef7cd 2020-11-29 op (require 'cl-lib)
137 af5ef7cd 2020-11-29 op (require 'seq)
138 23a0b465 2020-11-30 op (require 'vc)
139 3f25d9ff 2020-01-02 noreply (require 'vc-annotate)
141 f7012697 2021-08-17 op ;; FIXME: avoid loading this? We only need it for
142 f7012697 2021-08-17 op ;; log-edit-extract-headers in vc-got-checkin.
143 f7012697 2021-08-17 op (require 'log-edit)
145 2d83de2e 2021-01-05 op ;; FIXME: avoid loading this? We only need it for
146 2d83de2e 2021-01-05 op ;; vc-dir-filename-mouse-map in our custom printer.
147 2d83de2e 2021-01-05 op (require 'vc-dir)
149 e79563bd 2020-12-31 noreply (defgroup vc-got nil
150 e79563bd 2020-12-31 noreply "VC GoT backend."
151 e79563bd 2020-12-31 noreply :group 'vc)
153 e79563bd 2020-12-31 noreply (defcustom vc-got-program "got"
154 e79563bd 2020-12-31 noreply "Name of the Got executable (excluding any arguments)."
155 6eea6cfb 2021-01-05 op :type 'string)
157 12ca62f2 2020-12-26 op (defcustom vc-got-diff-switches t
158 12ca62f2 2020-12-26 op "String or list of strings specifying switches for Got diff under VC.
159 12ca62f2 2020-12-26 op If nil, use the value of `vc-diff-switches'. If t, use no switches."
160 12ca62f2 2020-12-26 op :type '(choice (const :tag "Unspecified" nil)
161 12ca62f2 2020-12-26 op (const :tag "None" t)
162 12ca62f2 2020-12-26 op (string :tag "Argument String")
163 6eea6cfb 2021-01-05 op (repeat :tag "Argument List" :value ("") string)))
166 f09d6359 2020-12-31 noreply (defun vc-got--program-version ()
167 76d978fa 2021-01-05 op "Return string representing the got version."
168 f09d6359 2020-12-31 noreply (let (process-file-side-effects)
169 f09d6359 2020-12-31 noreply (with-temp-buffer
170 f09d6359 2020-12-31 noreply (vc-got--call "-V")
171 f09d6359 2020-12-31 noreply (substring (buffer-string) 4 -1))))
173 af5ef7cd 2020-11-29 op (defun vc-got-root (file)
174 af5ef7cd 2020-11-29 op "Return the work tree root for FILE, or nil."
175 6a973a79 2021-08-11 op (vc-find-root file ".got"))
177 af5ef7cd 2020-11-29 op (defmacro vc-got-with-worktree (file &rest body)
178 af5ef7cd 2020-11-29 op "Evaluate BODY in the work tree directory of FILE."
179 af5ef7cd 2020-11-29 op (declare (indent defun))
180 af5ef7cd 2020-11-29 op `(when-let (default-directory (vc-got-root ,file))
183 686eac9a 2020-12-07 op (defun vc-got--repo-root ()
184 686eac9a 2020-12-07 op "Return the path to the repository root.
185 686eac9a 2020-12-07 op Assume `default-directory' is inside a got worktree."
186 686eac9a 2020-12-07 op (vc-got-with-worktree default-directory
187 686eac9a 2020-12-07 op (with-temp-buffer
188 686eac9a 2020-12-07 op (insert-file-contents ".got/repository")
189 76d978fa 2021-01-05 op (string-trim (buffer-string) "" "\n"))))
191 af5ef7cd 2020-11-29 op (defun vc-got--call (&rest args)
192 76d978fa 2021-01-05 op "Call `vc-got-program' with ARGS.
193 76d978fa 2021-01-05 op The output will be placed in the current buffer."
194 fab791a2 2020-01-03 op (apply #'process-file vc-got-program nil (current-buffer) nil
195 fab791a2 2020-01-03 op (cl-remove-if #'null (flatten-list args))))
197 23a0b465 2020-11-30 op (defun vc-got--add (files)
198 23a0b465 2020-11-30 op "Add FILES to got, passing `vc-register-switches' to the command invocation."
199 23a0b465 2020-11-30 op (with-temp-buffer
200 c3185bf7 2021-08-11 op (vc-got--call "add" vc-register-switches "--" files)))
202 0a66694e 2020-01-02 op (defun vc-got--log (&optional path limit start-commit stop-commit
203 0a66694e 2020-01-02 op search-pattern reverse)
204 76d978fa 2021-01-05 op "Execute the log command in the worktree of PATH in the current buffer.
205 23a0b465 2020-11-30 op LIMIT limits the maximum number of commit returned.
207 518ede14 2020-12-05 op START-COMMIT: start traversing history at the specified commit.
208 9ad1eb5d 2020-12-07 op STOP-COMMIT: stop traversing history at the specified commit.
209 518ede14 2020-12-05 op SEARCH-PATTERN: limit to log messages matched by the regexp given.
210 0a66694e 2020-01-02 op REVERSE: display the log messages in reverse order.
212 23a0b465 2020-11-30 op Return nil if the command failed or if PATH isn't included in any
214 0a66694e 2020-01-02 op (let (process-file-side-effects)
215 0a66694e 2020-01-02 op (vc-got-with-worktree (or path default-directory)
217 0a3316a6 2021-02-22 op (save-excursion
218 0a3316a6 2021-02-22 op (vc-got--call "log"
219 0a3316a6 2021-02-22 op (when limit (list "-l" (format "%s" limit)))
220 0a3316a6 2021-02-22 op (when start-commit (list "-c" start-commit))
221 0a3316a6 2021-02-22 op (when stop-commit (list "-x" stop-commit))
222 0a3316a6 2021-02-22 op (when search-pattern (list "-s" search-pattern))
223 0a3316a6 2021-02-22 op (when reverse '("-R"))
226 0a3316a6 2021-02-22 op (save-excursion
227 0a3316a6 2021-02-22 op (delete-matching-lines "^-----------------------------------------------$")
230 887e0699 2021-02-22 op (defun vc-got--status (status-codes dir-or-file &optional files)
231 668dc8eb 2021-01-04 op "Return a list of lists '(FILE STATUS STAGE-STATUS).
232 af5ef7cd 2020-11-29 op DIR-OR-FILE can be either a directory or a file. If FILES is
233 af5ef7cd 2020-11-29 op given, return the status of those files, otherwise the status of
234 668dc8eb 2021-01-04 op DIR-OR-FILE. STATUS-CODES is either nil, or a string that's
235 668dc8eb 2021-01-04 op passed as the -s flag to got status to limit the types of status
236 668dc8eb 2021-01-04 op to report (e.g. \"CD\" to report only conflicts and deleted
238 2d039a22 2021-02-21 op (with-temp-buffer
239 2d039a22 2021-02-21 op (let* ((default-directory (expand-file-name
240 2d039a22 2021-02-21 op (if (file-directory-p dir-or-file)
242 2d039a22 2021-02-21 op (file-name-directory dir-or-file))))
243 2d039a22 2021-02-21 op (root (vc-got-root default-directory))
244 2d039a22 2021-02-21 op (process-file-side-effects))
245 2d039a22 2021-02-21 op (when (zerop (vc-got--call "status"
246 2d039a22 2021-02-21 op (when status-codes (list "-s" status-codes))
248 2d039a22 2021-02-21 op (or files dir-or-file)))
249 2d039a22 2021-02-21 op (goto-char (point-min))
250 2d039a22 2021-02-21 op (cl-loop until (eobp)
251 2d039a22 2021-02-21 op ;; the format of each line is
252 2d039a22 2021-02-21 op ;; <status-char> <stage-char> <spc> <filename> \n
253 2d039a22 2021-02-21 op collect (let* ((file-status (prog1 (vc-got--parse-status-char
254 2d039a22 2021-02-21 op (char-after))
255 2d039a22 2021-02-21 op (forward-char)))
256 1b2afa91 2021-08-17 op (stage-status (let* ((c (char-after)))
258 1b2afa91 2021-08-17 op (when (member c '(?M ?A ?D))
260 1b2afa91 2021-08-17 op (forward-char))))
261 2d039a22 2021-02-21 op (filename (progn
262 2d039a22 2021-02-21 op (forward-char)
263 2d039a22 2021-02-21 op (buffer-substring (point)
264 2d039a22 2021-02-21 op (line-end-position)))))
265 2d039a22 2021-02-21 op (list (file-relative-name (expand-file-name filename root)
266 2d039a22 2021-02-21 op default-directory)
267 807ca5aa 2021-08-17 op (or file-status (and stage-status 'up-to-date))
268 2d039a22 2021-02-21 op stage-status))
269 2d039a22 2021-02-21 op do (forward-line))))))
271 668dc8eb 2021-01-04 op (defun vc-got--parse-status-char (c)
272 668dc8eb 2021-01-04 op "Parse status char C into a symbol accepted by `vc-state'."
276 668dc8eb 2021-01-04 op (?D 'removed)
277 668dc8eb 2021-01-04 op (?C 'conflict)
278 668dc8eb 2021-01-04 op (?! 'missing)
279 76d978fa 2021-01-05 op (?~ 'edited) ; XXX: what does it means for a file to be ``obstructed''?
280 668dc8eb 2021-01-04 op (?? 'unregistered)
281 76d978fa 2021-01-05 op (?m 'edited) ; modified file modes
284 23a0b465 2020-11-30 op (defun vc-got--tree-parse ()
285 23a0b465 2020-11-30 op "Parse into an alist the output of got tree -i in the current buffer."
286 23a0b465 2020-11-30 op (goto-char (point-min))
288 23a0b465 2020-11-30 op until (= (point) (point-max))
289 23a0b465 2020-11-30 op collect (let* ((obj-start (point))
290 23a0b465 2020-11-30 op (_ (forward-word))
291 23a0b465 2020-11-30 op (obj (buffer-substring obj-start (point)))
292 76d978fa 2021-01-05 op (_ (forward-char)) ; skip the space
293 23a0b465 2020-11-30 op (filename-start (point))
294 23a0b465 2020-11-30 op (_ (move-end-of-line nil))
295 23a0b465 2020-11-30 op (filename (buffer-substring filename-start (point))))
296 23a0b465 2020-11-30 op ;; goto the start of the next line
297 23a0b465 2020-11-30 op (forward-line)
298 23a0b465 2020-11-30 op (move-beginning-of-line nil)
299 23a0b465 2020-11-30 op `(,filename . ,obj))))
301 23a0b465 2020-11-30 op (defun vc-got--tree (commit path)
302 67332bad 2021-01-05 op "Return an alist representing the got tree command output.
303 76d978fa 2021-01-05 op The outputted tree will be localised in the given PATH at the
304 67332bad 2021-01-05 op given COMMIT."
305 23a0b465 2020-11-30 op (vc-got-with-worktree path
306 76d978fa 2021-01-05 op (let (process-file-side-effects)
307 76d978fa 2021-01-05 op (with-temp-buffer
308 c3185bf7 2021-08-11 op (when (zerop (vc-got--call "tree" "-c" commit "-i" "--" path))
309 76d978fa 2021-01-05 op (vc-got--tree-parse))))))
311 23a0b465 2020-11-30 op (defun vc-got--cat (commit obj-id)
312 23a0b465 2020-11-30 op "Execute got cat -c COMMIT OBJ-ID in the current buffer."
313 76d978fa 2021-01-05 op (let (process-file-side-effects)
314 76d978fa 2021-01-05 op (zerop (vc-got--call "cat" "-c" commit obj-id))))
316 eb85ad27 2020-12-05 op (defun vc-got--revert (&rest files)
317 76d978fa 2021-01-05 op "Execute got revert FILES."
318 eb85ad27 2020-12-05 op (vc-got-with-worktree (car files)
319 eb85ad27 2020-12-05 op (with-temp-buffer
320 c3185bf7 2021-08-11 op (zerop (vc-got--call "revert" "--" files)))))
322 eb85ad27 2020-12-05 op (defun vc-got--list-branches ()
323 eb85ad27 2020-12-05 op "Return an alist of (branch . commit)."
324 76d978fa 2021-01-05 op (let (process-file-side-effects)
325 76d978fa 2021-01-05 op (with-temp-buffer
326 76d978fa 2021-01-05 op (when (zerop (vc-got--call "branch" "-l"))
327 76d978fa 2021-01-05 op (goto-char (point-min))
329 76d978fa 2021-01-05 op until (= (point) (point-max))
330 76d978fa 2021-01-05 op ;; parse the `* $branchname: $commit', from the end
331 76d978fa 2021-01-05 op ;; XXX: use a regex?
332 76d978fa 2021-01-05 op collect (let* ((_ (move-end-of-line nil))
333 76d978fa 2021-01-05 op (end-commit (point))
334 76d978fa 2021-01-05 op (_ (backward-word))
335 76d978fa 2021-01-05 op (start-commit (point))
336 76d978fa 2021-01-05 op (_ (backward-char 2))
337 76d978fa 2021-01-05 op (end-branchname (point))
338 76d978fa 2021-01-05 op (_ (move-beginning-of-line nil))
339 76d978fa 2021-01-05 op (_ (forward-char 2))
340 76d978fa 2021-01-05 op (start-branchname (point))
341 76d978fa 2021-01-05 op (branchname (buffer-substring start-branchname end-branchname))
342 76d978fa 2021-01-05 op (commit (buffer-substring start-commit end-commit)))
343 76d978fa 2021-01-05 op (forward-line)
344 76d978fa 2021-01-05 op (move-beginning-of-line nil)
345 76d978fa 2021-01-05 op `(,branchname . ,commit)))))))
347 694534b4 2020-12-05 op (defun vc-got--current-branch ()
348 694534b4 2020-12-05 op "Return the current branch."
349 76d978fa 2021-01-05 op (let (process-file-side-effects)
350 76d978fa 2021-01-05 op (with-temp-buffer
351 76d978fa 2021-01-05 op (when (zerop (vc-got--call "branch"))
352 76d978fa 2021-01-05 op (string-trim (buffer-string) "" "\n")))))
354 eb85ad27 2020-12-05 op (defun vc-got--integrate (branch)
355 eb85ad27 2020-12-05 op "Integrate BRANCH into the current one."
356 eb85ad27 2020-12-05 op (with-temp-buffer
357 76d978fa 2021-01-05 op (zerop (vc-got--call "integrate" branch))))
359 db89d6fd 2021-08-16 op (defun vc-got--update (branch &optional paths)
360 db89d6fd 2021-08-16 op "Update to a different commit or BRANCH.
361 db89d6fd 2021-08-16 op Optionally restrict the update operation to files at or within
362 db89d6fd 2021-08-16 op the specified PATHS."
363 db89d6fd 2021-08-16 op (with-temp-buffer
364 db89d6fd 2021-08-16 op (unless (zerop (vc-got--call "update" "-b" branch "--" paths))
365 db89d6fd 2021-08-16 op (error "[vc-got] can't update to branch %s: %s"
367 db89d6fd 2021-08-16 op (buffer-string)))))
369 1d573c91 2021-08-17 op (defun vc-got--diff (&rest files)
370 1d573c91 2021-08-17 op "Call got diff against FILES.
371 1d573c91 2021-08-17 op The result will be stored in the current buffer."
372 76d978fa 2021-01-05 op (let (process-file-side-effects)
373 76d978fa 2021-01-05 op (zerop (vc-got--call "diff"
374 76d978fa 2021-01-05 op (vc-switches 'got 'diff)
376 1d573c91 2021-08-17 op (mapcar #'file-relative-name files)))))
378 6b6c8a78 2021-01-04 op (defun vc-got--unstage (file-or-directory)
379 6b6c8a78 2021-01-04 op "Unstage all the staged hunks at or within FILE-OR-DIRECTORY.
380 6b6c8a78 2021-01-04 op If it's nil, unstage every staged changes across the entire work
382 c3185bf7 2021-08-11 op (zerop (vc-got--call "unstage" "--" file-or-directory)))
384 a96df0e8 2020-01-03 noreply (defun vc-got--remove (file &optional force keep-local)
385 76d978fa 2021-01-05 op "Use got to remove FILE.
386 76d978fa 2021-01-05 op If FORCE is non-nil perform the operation even if a file contains
387 76d978fa 2021-01-05 op local modification. If KEEP-LOCAL is non-nil keep the affected
388 76d978fa 2021-01-05 op files on disk."
389 a96df0e8 2020-01-03 noreply (vc-got-with-worktree (or file default-directory)
390 a96df0e8 2020-01-03 noreply (with-temp-buffer
391 76d978fa 2021-01-05 op (zerop (vc-got--call "remove"
392 76d978fa 2021-01-05 op (when force "-f")
393 76d978fa 2021-01-05 op (when keep-local "-k")
397 5fb2f474 2021-08-10 op (defun vc-got--ref ()
398 5fb2f474 2021-08-10 op "Return a list of all references."
399 5fb2f474 2021-08-10 op (let (process-file-side-effects
400 5fb2f474 2021-08-10 op (re "^refs/\\(heads\\|remotes\\|tags\\)/\\(.*\\):")
401 5fb2f474 2021-08-10 op ;; hardcoding HEAD because it's always present and the regexp
402 5fb2f474 2021-08-10 op ;; won't match it.
403 5fb2f474 2021-08-10 op (table (list "HEAD")))
404 5fb2f474 2021-08-10 op (vc-got-with-worktree default-directory
405 5fb2f474 2021-08-10 op (with-temp-buffer
406 5fb2f474 2021-08-10 op (when (zerop (vc-got--call "ref" "-l"))
407 5fb2f474 2021-08-10 op (goto-char (point-min))
408 5fb2f474 2021-08-10 op (while (re-search-forward re nil t)
409 5fb2f474 2021-08-10 op (push (match-string 2) table))
412 8014bde1 2021-08-10 op (defun vc-got--branch (name)
413 8014bde1 2021-08-10 op "Try to create and switch to the branch called NAME."
414 8014bde1 2021-08-10 op (let (process-file-side-effects)
415 8014bde1 2021-08-10 op (vc-got-with-worktree default-directory
416 8014bde1 2021-08-10 op (with-temp-buffer
417 c3185bf7 2021-08-11 op (if (zerop (vc-got--call "branch" "--" name))
419 8014bde1 2021-08-10 op (error "[vc-got] can't create branch %s: %s" name
420 8014bde1 2021-08-10 op (buffer-string)))))))
423 af5ef7cd 2020-11-29 op ;; Backend properties
425 af5ef7cd 2020-11-29 op (defun vc-got-revision-granularity ()
426 af5ef7cd 2020-11-29 op "Got has REPOSITORY granularity."
429 af5ef7cd 2020-11-29 op ;; XXX: what this should do? The description is not entirely clear
430 af5ef7cd 2020-11-29 op (defun vc-got-update-on-retrieve-tag ()
434 af5ef7cd 2020-11-29 op ;; State-querying functions
436 af5ef7cd 2020-11-29 op ;;;###autoload (defun vc-got-registered (file)
437 af5ef7cd 2020-11-29 op ;;;###autoload "Return non-nil if FILE is registered with got."
438 af5ef7cd 2020-11-29 op ;;;###autoload (when (vc-find-root file ".got")
439 af5ef7cd 2020-11-29 op ;;;###autoload (load "vc-got" nil t)
440 af5ef7cd 2020-11-29 op ;;;###autoload (vc-got-registered file)))
442 af5ef7cd 2020-11-29 op (defun vc-got-registered (file)
443 af5ef7cd 2020-11-29 op "Return non-nil if FILE is registered with got."
444 af5ef7cd 2020-11-29 op (if (file-directory-p file)
445 76d978fa 2021-01-05 op nil ; got doesn't track directories
446 4093d2f9 2020-12-04 op (when (vc-find-root file ".got")
447 668dc8eb 2021-01-04 op (let ((s (vc-got-state file)))
448 668dc8eb 2021-01-04 op (not (or (eq s 'unregistered)
449 668dc8eb 2021-01-04 op (null s)))))))
451 af5ef7cd 2020-11-29 op (defun vc-got-state (file)
452 af5ef7cd 2020-11-29 op "Return the current version control state of FILE. See `vc-state'."
453 af5ef7cd 2020-11-29 op (unless (file-directory-p file)
454 76d978fa 2021-01-05 op (let (process-file-side-effects)
455 76d978fa 2021-01-05 op ;; Manually calling got status and checking the result inline to
456 76d978fa 2021-01-05 op ;; avoid building the data structure in vc-got--status.
457 76d978fa 2021-01-05 op (with-temp-buffer
458 c3185bf7 2021-08-11 op (when (zerop (vc-got--call "status" "--" file))
459 76d978fa 2021-01-05 op (goto-char (point-min))
462 76d978fa 2021-01-05 op (vc-got--parse-status-char (char-after))))))))
464 dcb5b83a 2021-01-08 op (defun vc-got--dir-filter-files (files)
465 dcb5b83a 2021-01-08 op "Remove ., .. and .got from FILES."
466 dcb5b83a 2021-01-08 op (cl-loop for file in files
467 dcb5b83a 2021-01-08 op unless (or (string= file "..")
468 dcb5b83a 2021-01-08 op (string= file ".")
469 dcb5b83a 2021-01-08 op (string= file ".got"))
470 dcb5b83a 2021-01-08 op collect file))
472 af5ef7cd 2020-11-29 op (defun vc-got-dir-status-files (dir files update-function)
473 5b4a6b90 2021-01-04 op "Build the status for FILES in DIR.
474 76d978fa 2021-01-05 op The builded result is given to the callback UPDATE-FUNCTION. If
475 5b4a6b90 2021-01-04 op FILES is nil, consider all the files in DIR."
476 dcb5b83a 2021-01-08 op (let* ((fs (vc-got--dir-filter-files (or files (directory-files dir))))
477 d346ca63 2021-01-08 op ;; XXX: we call with files, wich will probably be nil on the
478 d346ca63 2021-01-08 op ;; first run, so we catch deleted, missing and edited files
479 d346ca63 2021-01-08 op ;; in subdirectories.
480 d346ca63 2021-01-08 op (res (vc-got--status nil dir files))
481 d346ca63 2021-01-08 op double-check)
482 82289421 2020-01-02 op (cl-loop for file in fs
483 76d978fa 2021-01-05 op do (when (and (not (cdr (assoc file res #'string=)))
484 76d978fa 2021-01-05 op (not (file-directory-p file))
485 76d978fa 2021-01-05 op ;; if file doesn't exists, it's a
486 76d978fa 2021-01-05 op ;; untracked file that was removed.
487 76d978fa 2021-01-05 op (file-exists-p file))
488 d346ca63 2021-01-08 op ;; if we don't know the status of a file here, it's
489 d346ca63 2021-01-08 op ;; either up-to-date or ignored. Save it for a
490 d346ca63 2021-01-08 op ;; double check
491 d346ca63 2021-01-08 op (push file double-check)))
492 cb973832 2021-01-08 op (cl-loop with statuses = (vc-got--status nil dir double-check)
493 cb973832 2021-01-08 op for file in double-check
494 cb973832 2021-01-08 op unless (eq 'unregistered (cadr (assoc file statuses #'string=)))
495 d346ca63 2021-01-08 op do (push (list file 'up-to-date nil) res))
496 d346ca63 2021-01-08 op (funcall update-function res nil)))
498 c27df03e 2020-01-03 op (defun vc-got-dir-extra-headers (dir)
499 c27df03e 2020-01-03 op "Return a string for the `vc-dir' buffer heading for directory DIR."
500 76d978fa 2021-01-05 op (let ((remote (vc-got-repository-url dir)))
501 76d978fa 2021-01-05 op (concat (propertize "Repository : " 'face 'font-lock-type-face)
502 76d978fa 2021-01-05 op (vc-got--repo-root) "\n"
505 76d978fa 2021-01-05 op (propertize "Remote URL : " 'face 'font-lock-type-face)
506 76d978fa 2021-01-05 op (vc-got-repository-url dir) "\n"))
507 76d978fa 2021-01-05 op (propertize "Branch : " 'face 'font-lock-type-face)
508 76d978fa 2021-01-05 op (vc-got--current-branch))))
510 2d83de2e 2021-01-05 op (defun vc-got-dir-printer (info)
511 2d83de2e 2021-01-05 op "Pretty-printer for the vc-dir-fileinfo structure INFO."
512 2d83de2e 2021-01-05 op (let* ((isdir (vc-dir-fileinfo->directory info))
513 76d978fa 2021-01-05 op (state (if isdir "" (vc-dir-fileinfo->state info)))
514 76d978fa 2021-01-05 op (stage-state (vc-dir-fileinfo->extra info))
515 76d978fa 2021-01-05 op (filename (vc-dir-fileinfo->name info)))
519 2d83de2e 2021-01-05 op (format "%c" (if (vc-dir-fileinfo->marked info) ?* ? ))
520 2d83de2e 2021-01-05 op 'face 'font-lock-type-face)
523 1b2afa91 2021-08-17 op (format "%-12s" state)
524 2d83de2e 2021-01-05 op 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
525 76d978fa 2021-01-05 op ((memq state '(missing conflict)) 'font-lock-warning-face)
526 76d978fa 2021-01-05 op ((eq state 'edited) 'font-lock-constant-face)
527 76d978fa 2021-01-05 op (t 'font-lock-variable-name-face))
528 1b2afa91 2021-08-17 op 'mouse-face 'highlight
529 1b2afa91 2021-08-17 op 'keymap vc-dir-status-mouse-map)
531 1b2afa91 2021-08-17 op " " (propertize
532 1b2afa91 2021-08-17 op (if stage-state
533 1b2afa91 2021-08-17 op (format "%c" stage-state)
535 1b2afa91 2021-08-17 op 'face (cond ((memq stage-state '(?A ?E)) 'font-lock-constant-face)
536 1b2afa91 2021-08-17 op ((eq stage-state ?R) 'font-lock-warning-face)
537 1b2afa91 2021-08-17 op (t 'font-lock-variable-name-face)))
539 1b2afa91 2021-08-17 op (propertize filename
540 1b2afa91 2021-08-17 op 'face (if isdir 'font-lock-comment-delimiter-face
541 1b2afa91 2021-08-17 op 'font-lock-function-name-face)
544 1b2afa91 2021-08-17 op "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu"
545 1b2afa91 2021-08-17 op "File\nmouse-3: Pop-up menu")
546 1b2afa91 2021-08-17 op 'mouse-face 'highlight
547 1b2afa91 2021-08-17 op 'keymap vc-dir-filename-mouse-map))))
549 af5ef7cd 2020-11-29 op (defun vc-got-working-revision (file)
550 c0c9a339 2020-12-04 op "Return the id of the last commit that touched the FILE or \"0\" for a new (but added) file."
552 af5ef7cd 2020-11-29 op (with-temp-buffer
553 518ede14 2020-12-05 op (when (vc-got--log file 1)
555 af5ef7cd 2020-11-29 op (goto-char (point-min))
556 76d978fa 2021-01-05 op (forward-word) ; skip "commit"
557 76d978fa 2021-01-05 op (forward-char) ; skip the space
558 76d978fa 2021-01-05 op (setq start (point)) ; store start of the SHA
559 76d978fa 2021-01-05 op (forward-word) ; goto SHA end
560 af5ef7cd 2020-11-29 op (buffer-substring start (point)))))
561 af5ef7cd 2020-11-29 op ;; special case: if this file is added but has no previous commits
562 af5ef7cd 2020-11-29 op ;; touching it, got log will fail (as expected), but we have to
563 af5ef7cd 2020-11-29 op ;; return "0".
564 af5ef7cd 2020-11-29 op (when (eq (vc-got-state file) 'added)
567 af5ef7cd 2020-11-29 op (defun vc-got-checkout-model (_files)
568 5b4a6b90 2021-01-04 op "Got uses an implicit checkout model for every file."
571 694534b4 2020-12-05 op (defun vc-got-mode-line-string (file)
572 694534b4 2020-12-05 op "Return the VC mode line string for FILE."
573 694534b4 2020-12-05 op (vc-got-with-worktree file
574 694534b4 2020-12-05 op (let ((def (vc-default-mode-line-string 'Got file)))
575 694534b4 2020-12-05 op (concat (substring def 0 4) (vc-got--current-branch)))))
578 23a0b465 2020-11-30 op ;; state-changing functions
580 23a0b465 2020-11-30 op (defun vc-got-create-repo (_backend)
581 7726b6c9 2021-08-10 op "Create an empty repository in the current directory."
582 7726b6c9 2021-08-10 op (error "[vc-got] create-repo not implemented"))
584 23a0b465 2020-11-30 op (defun vc-got-register (files &optional _comment)
585 23a0b465 2020-11-30 op "Register FILES, passing `vc-register-switches' to the backend command."
586 23a0b465 2020-11-30 op (vc-got--add files))
588 9e805da8 2020-11-30 op (defalias 'vc-got-responsible-p #'vc-got-root)
590 241a3b12 2021-08-11 op (defun vc-got-unregister (file)
591 241a3b12 2021-08-11 op "Unregister FILE."
592 9114bbc3 2021-08-11 op (vc-got--remove file t t))
594 23a0b465 2020-11-30 op (defun vc-got-checkin (files comment &optional _rev)
595 23a0b465 2020-11-30 op "Commit FILES with COMMENT as commit message."
596 23a0b465 2020-11-30 op (with-temp-buffer
597 ad36649b 2021-02-25 op (unless (zerop (vc-got--call "commit" "-m"
598 e7747ce0 2021-08-11 op (log-edit-extract-headers nil comment)
601 26362bf0 2021-08-11 op (error "[vc-got] can't commit: %s" (buffer-string)))))
603 23a0b465 2020-11-30 op (defun vc-got-find-revision (file rev buffer)
604 c0c9a339 2020-12-04 op "Fill BUFFER with the content of FILE in the given revision REV."
605 23a0b465 2020-11-30 op (when-let (obj-id (assoc file (vc-got--tree rev file) #'string=))
606 23a0b465 2020-11-30 op (with-current-buffer buffer
607 23a0b465 2020-11-30 op (vc-got-with-worktree file
608 23a0b465 2020-11-30 op (vc-got--cat rev obj-id)))))
610 eb85ad27 2020-12-05 op (defun vc-got-checkout (_file &optional _rev)
611 76d978fa 2021-01-05 op "Checkout revision REV of FILE.
612 76d978fa 2021-01-05 op If REV is t, checkout from the head."
613 7726b6c9 2021-08-10 op (error "[vc-got] checkout not implemented"))
615 eb85ad27 2020-12-05 op (defun vc-got-revert (file &optional _content-done)
616 eb85ad27 2020-12-05 op "Revert FILE back to working revision."
617 eb85ad27 2020-12-05 op (vc-got--revert file))
619 eb85ad27 2020-12-05 op (defun vc-got-merge-branch ()
620 eb85ad27 2020-12-05 op "Prompt for a branch and integrate it into the current one."
621 eb85ad27 2020-12-05 op ;; XXX: be smart and try to "got rebase" if "got integrate" fails?
622 eb85ad27 2020-12-05 op (let* ((branches (cl-loop for (branch . commit) in (vc-got--list-branches)
623 eb85ad27 2020-12-05 op collect branch))
624 eb85ad27 2020-12-05 op (branch (completing-read "Merge from branch: " branches)))
626 eb85ad27 2020-12-05 op (vc-got--integrate branch))))
628 dec54a74 2021-02-21 op (defun vc-got--push-pull (cmd op prompt)
629 dec54a74 2021-02-21 op "Execute CMD OP, or prompt the user if PROMPT is non-nil."
630 dec54a74 2021-02-21 op (let ((buffer (format "*vc-got : %s*" (expand-file-name default-directory))))
631 686eac9a 2020-12-07 op (when-let (cmd (if prompt
632 686eac9a 2020-12-07 op (split-string
633 686eac9a 2020-12-07 op (read-shell-command (format "%s %s command: " cmd op)
634 1870c8bd 2021-03-27 op (format "%s %s " cmd op))
636 686eac9a 2020-12-07 op (list cmd op)))
637 dec54a74 2021-02-21 op (apply #'vc-do-async-command buffer default-directory cmd)
638 dec54a74 2021-02-21 op ;; this comes from vc-git.el. We're using git to push, so in
639 dec54a74 2021-02-21 op ;; part it makes sense, but we should revisit for full Got
641 dec54a74 2021-02-21 op (with-current-buffer buffer
642 dec54a74 2021-02-21 op (vc-compilation-mode 'git)
643 dec54a74 2021-02-21 op (let ((comp-cmd (mapconcat #'identity cmd " ")))
644 dec54a74 2021-02-21 op (setq-local compile-command comp-cmd
645 dec54a74 2021-02-21 op compilation-directory default-directory
646 dec54a74 2021-02-21 op compilation-arguments (list comp-cmd
648 dec54a74 2021-02-21 op (lambda (_ign) buffer)
650 dec54a74 2021-02-21 op (vc-set-async-update buffer))))
652 67e0b4d2 2021-08-03 op ;; TODO: this can be expanded. See whan omyksh does:
653 67e0b4d2 2021-08-03 op ;; function got-sync {
654 67e0b4d2 2021-08-03 op ;; local _remote _info _branch
655 67e0b4d2 2021-08-03 op ;; _remote=$1
656 67e0b4d2 2021-08-03 op ;; _info="$(got info)"
657 67e0b4d2 2021-08-03 op ;; _branch="$(echo "$_info" | awk '/branch reference:/ {l = split($NF, a, "/"); print a[l]}')"
658 67e0b4d2 2021-08-03 op ;; [ -z $_remote ] && _remote="origin"
659 67e0b4d2 2021-08-03 op ;; [ -z $_branch ] && _branch="main"
660 67e0b4d2 2021-08-03 op ;; got fetch "$_remote" && got update -b "$_remote/$_branch" && \
661 67e0b4d2 2021-08-03 op ;; got rebase $_branch
663 eb85ad27 2020-12-05 op (defun vc-got-pull (prompt)
664 eb85ad27 2020-12-05 op "Execute got pull, prompting the user for the full command if PROMPT is not nil."
665 dec54a74 2021-02-21 op (let ((default-directory (vc-got-root default-directory)))
666 dec54a74 2021-02-21 op (vc-got--push-pull vc-got-program "fetch" prompt)))
668 686eac9a 2020-12-07 op (defun vc-got-push (prompt)
669 686eac9a 2020-12-07 op "Run git push (not got!) in the repository dir.
670 686eac9a 2020-12-07 op If PROMPT is non-nil, prompt for the git command to run."
671 dec54a74 2021-02-21 op (let ((default-directory (vc-got--repo-root)))
672 dec54a74 2021-02-21 op (vc-got--push-pull "git" "push" prompt)))
675 424f5152 2021-08-10 op ;; History functions
677 eb85ad27 2020-12-05 op (defun vc-got-print-log (files buffer &optional _shortlog start-revision limit)
678 eb85ad27 2020-12-05 op "Insert the revision log for FILES into BUFFER.
679 76d978fa 2021-01-05 op LIMIT limits the number of commits, optionally starting at
680 76d978fa 2021-01-05 op START-REVISION."
681 eb85ad27 2020-12-05 op (with-current-buffer buffer
682 eb85ad27 2020-12-05 op ;; the *vc-diff* may be read only
683 4571b1fd 2020-12-05 op (let ((inhibit-read-only t))
684 eb85ad27 2020-12-05 op (cl-loop for file in files
685 4571b1fd 2020-12-05 op do (vc-got--log (file-relative-name file) limit start-revision)))))
687 9ad1eb5d 2020-12-07 op ;; XXX: this includes also the latest commit in REMOTE-LOCATION.
688 9ad1eb5d 2020-12-07 op (defun vc-got-log-outgoing (buffer remote-location)
689 9ad1eb5d 2020-12-07 op "Fill BUFFER with the diff between the local worktree branch and REMOTE-LOCATION."
690 9ad1eb5d 2020-12-07 op (vc-setup-buffer buffer)
691 9ad1eb5d 2020-12-07 op (let ((rl (if (or (not remote-location) (string-empty-p remote-location))
692 9ad1eb5d 2020-12-07 op (concat "origin/" (vc-got--current-branch))
693 9ad1eb5d 2020-12-07 op remote-location))
694 9ad1eb5d 2020-12-07 op (inhibit-read-only t))
695 9ad1eb5d 2020-12-07 op (with-current-buffer buffer
696 9ad1eb5d 2020-12-07 op (vc-got--log nil nil nil rl))))
698 6eda2f1f 2020-12-26 op (defun vc-got-incoming (buffer remote-location)
699 6eda2f1f 2020-12-26 op "Fill BUFFER with the diff between the REMOTE-LOCATION and the local worktree branch."
700 6eda2f1f 2020-12-26 op (let ((rl (if (or (not remote-location) (string-empty-p remote-location))
701 6eda2f1f 2020-12-26 op (concat "origin/" (vc-got--current-branch))
702 6eda2f1f 2020-12-26 op remote-location))
703 6eda2f1f 2020-12-26 op (inhibit-read-only t))
704 6eda2f1f 2020-12-26 op (with-current-buffer buffer
705 6eda2f1f 2020-12-26 op (vc-got--log nil nil (vc-got--current-branch) rl))))
707 eb85ad27 2020-12-05 op (defun vc-got-log-search (buffer pattern)
708 eb85ad27 2020-12-05 op "Search commits for PATTERN and write the results found in BUFFER."
709 eb85ad27 2020-12-05 op (with-current-buffer buffer
710 eb85ad27 2020-12-05 op (let ((inhibit-read-only t))
711 9ad1eb5d 2020-12-07 op (vc-got--log nil nil nil nil pattern))))
713 0a3316a6 2021-02-22 op (define-derived-mode vc-got-log-view-mode log-view-mode "Got-Log-View"
714 0a3316a6 2021-02-22 op "Got-specific log-view mode.
715 0a3316a6 2021-02-22 op Heavily inspired by `vc-git-log-view-mode'."
716 0a3316a6 2021-02-22 op (require 'add-log)
718 0a3316a6 2021-02-22 op log-view-file-re regexp-unmatchable
719 0a3316a6 2021-02-22 op log-view-per-file-logs nil
720 0a3316a6 2021-02-22 op log-view-message-re "^commit +\\([0-9a-z]+\\)"
722 0a3316a6 2021-02-22 op log-view-font-lock-keywords
724 0a3316a6 2021-02-22 op `((,log-view-message-re (1 'change-log-acknowledgment)))
725 0a3316a6 2021-02-22 op ;; Handle the case:
726 0a3316a6 2021-02-22 op ;; user: foo@bar
727 0a3316a6 2021-02-22 op '(("^from: \\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
728 0a3316a6 2021-02-22 op (1 'change-log-email))
729 0a3316a6 2021-02-22 op ;; Handle the case:
730 0a3316a6 2021-02-22 op ;; user: FirstName LastName <foo@bar>
731 0a3316a6 2021-02-22 op ("^from: \\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
732 0a3316a6 2021-02-22 op (1 'change-log-name)
733 0a3316a6 2021-02-22 op (2 'change-log-email))
734 0a3316a6 2021-02-22 op ("^date: \\(.+\\)" (1 'change-log-date))))))
736 eb85ad27 2020-12-05 op ;; TODO: async
737 f18d3e11 2020-12-05 op ;; TODO: return 0 or 1
738 eb85ad27 2020-12-05 op (defun vc-got-diff (files &optional rev1 rev2 buffer _async)
739 eb85ad27 2020-12-05 op "Insert into BUFFER (or *vc-diff*) the diff for FILES from REV1 to REV2."
740 f457868b 2020-12-07 op (let* ((buffer (get-buffer-create (or buffer "*vc-diff*")))
741 eb85ad27 2020-12-05 op (inhibit-read-only t))
742 eb85ad27 2020-12-05 op (with-current-buffer buffer
743 8ec0bb76 2021-08-11 op (vc-got-with-worktree (or (car files)
744 8ec0bb76 2021-08-11 op default-directory)
745 e9a5df05 2021-08-10 op (if (and (null rev1)
747 e9a5df05 2021-08-10 op (dolist (file files)
748 e9a5df05 2021-08-10 op (vc-got--diff file))
749 e9a5df05 2021-08-10 op ;; TODO: if rev1 is nil, diff from the current version until
752 e9a5df05 2021-08-10 op ;; TODO: if rev2 is nil as well, diff against an empty tree
753 e9a5df05 2021-08-10 op ;; (i.e. get the patch from `got log -p rev1')
755 83559c7c 2021-08-11 op ;; TODO: it would be nice to optionally include FILES here,
756 83559c7c 2021-08-11 op ;; it would make the `=' key on the *Annotate* buffer do the
757 83559c7c 2021-08-11 op ;; right thing, but AFAICS got doesn't provide something
758 83559c7c 2021-08-11 op ;; like this. Probably only hacking something with ``log
759 83559c7c 2021-08-11 op ;; -p'' and filtering?
760 e9a5df05 2021-08-10 op (vc-got--diff rev1 rev2))))))
762 5fb2f474 2021-08-10 op (defun vc-got-revision-completion-table (_files)
763 5fb2f474 2021-08-10 op "Return a completion table for existing revisions.
764 5fb2f474 2021-08-10 op Ignores FILES because GoT doesn't have the concept of ``file
765 5fb2f474 2021-08-10 op revisions''; instead, like with git, you have tags and branches."
766 5fb2f474 2021-08-10 op (letrec ((table (lazy-completion-table
767 5fb2f474 2021-08-10 op table (lambda () (vc-got--ref)))))
770 3f25d9ff 2020-01-02 noreply (defun vc-got-annotate-command (file buf &optional rev)
771 67332bad 2021-01-05 op "Show annotated contents of FILE in buffer BUF. If given, use revision REV."
772 3f25d9ff 2020-01-02 noreply (let (process-file-side-effects)
773 3f25d9ff 2020-01-02 noreply (with-current-buffer buf
774 3f25d9ff 2020-01-02 noreply ;; FIXME: vc-ensure-vc-buffer won't recognise this buffer as managed
775 3f25d9ff 2020-01-02 noreply ;; by got unless vc-parent-buffer points to a buffer managed by got.
776 3f25d9ff 2020-01-02 noreply ;; investigate why this is needed.
777 3f25d9ff 2020-01-02 noreply (set (make-local-variable 'vc-parent-buffer) (find-file-noselect file))
778 76d978fa 2021-01-05 op (vc-got--call "blame"
779 76d978fa 2021-01-05 op (when rev (list "-c" rev))
783 3f25d9ff 2020-01-02 noreply (defconst vc-got--annotate-re
784 3f25d9ff 2020-01-02 noreply (concat "^[0-9]\\{1,\\}) " ; line number followed by )
785 3f25d9ff 2020-01-02 noreply "\\([a-z0-9]+\\) " ; SHA-1 of commit
786 3f25d9ff 2020-01-02 noreply "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\) " ; year-mm-dd
787 3f25d9ff 2020-01-02 noreply "\\([^ ]\\)+ ") ; author
788 3f25d9ff 2020-01-02 noreply "Regexp to match annotation output lines.
790 3f25d9ff 2020-01-02 noreply Provides capture groups for:
791 3f25d9ff 2020-01-02 noreply 1. revision id
792 3f25d9ff 2020-01-02 noreply 2. date of commit
793 3f25d9ff 2020-01-02 noreply 3. author of commit")
795 3f25d9ff 2020-01-02 noreply (defconst vc-got--commit-re "^commit \\([a-z0-9]+\\)"
796 3f25d9ff 2020-01-02 noreply "Regexp to match commit lines.
798 3f25d9ff 2020-01-02 noreply Provides capture group for the commit revision id.")
800 3f25d9ff 2020-01-02 noreply (defun vc-got-annotate-time ()
801 3f25d9ff 2020-01-02 noreply "Return the time of the next line of annotation at or after point.
802 3f25d9ff 2020-01-02 noreply Value is returned as floating point fractional number of days."
803 3f25d9ff 2020-01-02 noreply (save-excursion
804 3f25d9ff 2020-01-02 noreply (beginning-of-line)
805 3f25d9ff 2020-01-02 noreply (when (looking-at vc-got--annotate-re)
806 3f25d9ff 2020-01-02 noreply (let ((str (match-string-no-properties 2)))
807 3f25d9ff 2020-01-02 noreply (vc-annotate-convert-time
808 3f25d9ff 2020-01-02 noreply (encode-time 0 0 0
809 3f25d9ff 2020-01-02 noreply (string-to-number (substring str 8 10))
810 3f25d9ff 2020-01-02 noreply (string-to-number (substring str 5 7))
811 3f25d9ff 2020-01-02 noreply (string-to-number (substring str 0 4))))))))
813 3f25d9ff 2020-01-02 noreply (defun vc-got-annotate-extract-revision-at-line ()
814 67332bad 2021-01-05 op "Return revision corresponding to the current line or nil."
815 3f25d9ff 2020-01-02 noreply (save-excursion
816 3f25d9ff 2020-01-02 noreply (beginning-of-line)
817 3f25d9ff 2020-01-02 noreply (when (looking-at vc-got--annotate-re)
818 3f25d9ff 2020-01-02 noreply (match-string-no-properties 1))))
821 8014bde1 2021-08-10 op ;; Tag system
823 6ab1c7b4 2021-08-11 op (defun vc-got--tag-callback (tag)
824 6ab1c7b4 2021-08-11 op "`log-edit' callback for `vc-got-create-tag'.
825 6ab1c7b4 2021-08-11 op Creates the TAG using the content of the current buffer."
826 6ab1c7b4 2021-08-11 op (interactive)
827 6ab1c7b4 2021-08-11 op (let ((msg (buffer-substring-no-properties (point-min)
828 6ab1c7b4 2021-08-11 op (point-max))))
829 6ab1c7b4 2021-08-11 op (with-temp-buffer
830 c3185bf7 2021-08-11 op (unless (zerop (vc-got--call "tag" "-m" msg "--" tag))
831 6ab1c7b4 2021-08-11 op (error "[vc-got] can't create tag %s: %s" tag (buffer-string))))))
833 8014bde1 2021-08-10 op (defun vc-got-create-tag (_dir name branchp)
834 8014bde1 2021-08-10 op "Attach the tag NAME to the state of the worktree.
835 6ab1c7b4 2021-08-11 op DIR is ignored (tags are global, not per-file). If BRANCHP is
836 6ab1c7b4 2021-08-11 op true, NAME should create a new branch otherwise it will pop-up a
837 6ab1c7b4 2021-08-11 op `log-edit' buffer to provide the tag message."
838 8014bde1 2021-08-10 op ;; TODO: vc reccomends to ensure that all the file are in a clean
839 8014bde1 2021-08-10 op ;; state, but is it useful?
841 8014bde1 2021-08-10 op (vc-got--branch name)
842 6ab1c7b4 2021-08-11 op (let ((buf (get-buffer-create "*vc-got tag*")))
843 6ab1c7b4 2021-08-11 op (with-current-buffer buf
844 6ab1c7b4 2021-08-11 op (erase-buffer)
845 6ab1c7b4 2021-08-11 op (switch-to-buffer buf)
846 6ab1c7b4 2021-08-11 op (log-edit (lambda ()
847 6ab1c7b4 2021-08-11 op (interactive)
848 6ab1c7b4 2021-08-11 op (unwind-protect
849 6ab1c7b4 2021-08-11 op (vc-got--tag-callback name)
850 6ab1c7b4 2021-08-11 op (kill-buffer buf))))))))
852 09d59379 2021-08-11 op (defun vc-got-retrieve-tag (dir name _update)
853 09d59379 2021-08-11 op "Switch to the tag NAME for files at or below DIR."
854 09d59379 2021-08-11 op (let ((default-directory dir))
855 db89d6fd 2021-08-16 op (vc-got--update name dir)))
858 424f5152 2021-08-10 op ;; Miscellaneous
860 2552a6c7 2021-08-11 op (defun vc-got-find-ignore-file (file)
861 2552a6c7 2021-08-11 op "Return the gitignore file that controls FILE."
862 2552a6c7 2021-08-11 op (expand-file-name ".gitignore"
863 2552a6c7 2021-08-11 op (vc-got-root file)))
865 3f25d9ff 2020-01-02 noreply (defun vc-got-previous-revision (file rev)
866 3f25d9ff 2020-01-02 noreply "Return the revision number that precedes REV for FILE, or nil if no such revision exists."
867 3f25d9ff 2020-01-02 noreply (with-temp-buffer
868 3f25d9ff 2020-01-02 noreply (vc-got--log file 2 rev nil nil t)
869 3f25d9ff 2020-01-02 noreply (goto-char (point-min))
870 3f25d9ff 2020-01-02 noreply (keep-lines "^commit")
871 3f25d9ff 2020-01-02 noreply (when (looking-at vc-got--commit-re)
872 3f25d9ff 2020-01-02 noreply (match-string-no-properties 1))))
874 3f25d9ff 2020-01-02 noreply (defun vc-got-next-revision (file rev)
875 67332bad 2021-01-05 op "Return the revision number that follows REV for FILE, or nil if no such revision exists."
876 3f25d9ff 2020-01-02 noreply (with-temp-buffer
877 3f25d9ff 2020-01-02 noreply (vc-got--log file nil nil rev)
878 3f25d9ff 2020-01-02 noreply (keep-lines "^commit" (point-min) (point-max))
879 3f25d9ff 2020-01-02 noreply (goto-char (point-max))
880 76d978fa 2021-01-05 op (forward-line -1) ; return from empty line to last actual commit
881 3f25d9ff 2020-01-02 noreply (unless (= (point) (point-min))
882 3f25d9ff 2020-01-02 noreply (forward-line -1)
883 3f25d9ff 2020-01-02 noreply (when (looking-at vc-got--commit-re)
884 3f25d9ff 2020-01-02 noreply (match-string-no-properties 1)))))
886 a96df0e8 2020-01-03 noreply (defun vc-got-delete-file (file)
887 a96df0e8 2020-01-03 noreply "Delete FILE locally and mark it deleted in work tree."
888 a96df0e8 2020-01-03 noreply (vc-got--remove file t))
890 c151c257 2021-08-03 op (defun vc-got-find-file-hook ()
891 c151c257 2021-08-03 op "Activate `smerge-mode' if there is a conflict."
892 c151c257 2021-08-03 op ;; just like vc-git-find-file-hook
893 c151c257 2021-08-03 op (when (and buffer-file-name
894 c151c257 2021-08-03 op (eq (vc-state buffer-file-name 'Got) 'conflict)
895 c151c257 2021-08-03 op (save-excursion
896 c151c257 2021-08-03 op (goto-char (point-min))
897 c151c257 2021-08-03 op (re-search-forward "^<<<<<<< " nil 'noerror)))
898 c151c257 2021-08-03 op (smerge-start-session)
899 c151c257 2021-08-03 op (vc-message-unresolved-conflicts buffer-file-name)))
901 7bb16f79 2020-01-03 op (defun vc-got-conflicted-files (dir)
902 7bb16f79 2020-01-03 op "Return the list of files with conflicts in directory DIR."
903 7bb16f79 2020-01-03 op (let* ((root (vc-got-root dir))
904 7bb16f79 2020-01-03 op (default-directory root)
905 7bb16f79 2020-01-03 op (process-file-side-effects))
906 7bb16f79 2020-01-03 op (cl-loop with conflicts = nil
907 668dc8eb 2021-01-04 op for (file status _) in (vc-got--status "C" ".")
908 7bb16f79 2020-01-03 op do (when (and (eq status 'conflict)
909 7bb16f79 2020-01-03 op (file-in-directory-p file dir))
910 7bb16f79 2020-01-03 op (push file conflicts))
911 7bb16f79 2020-01-03 op finally return conflicts)))
913 8b635a9f 2020-01-03 op (defun vc-got-repository-url (_file &optional remote-name)
914 8b635a9f 2020-01-03 op "Return URL for REMOTE-NAME, or for \"origin\" if nil."
915 8b635a9f 2020-01-03 op (let* ((default-directory (vc-got--repo-root))
916 8b635a9f 2020-01-03 op (remote-name (or remote-name "origin"))
917 8b635a9f 2020-01-03 op (heading (concat "[remote \"" remote-name "\"]"))
918 76d978fa 2021-01-05 op (conf (cond ((file-exists-p ".git/config") ".git/config")
919 76d978fa 2021-01-05 op ((file-exists-p ".git") nil)
920 76d978fa 2021-01-05 op ((file-exists-p "config") "config")))
923 6f42ede4 2021-01-05 op (with-temp-buffer
924 f8a9db56 2020-01-03 op (insert-file-contents conf)
925 f8a9db56 2020-01-03 op (goto-char (point-min))
926 f8a9db56 2020-01-03 op (when (search-forward heading nil t)
927 f8a9db56 2020-01-03 op (forward-line)
928 f8a9db56 2020-01-03 op (while (and (not found)
929 76d978fa 2021-01-05 op (looking-at ".*=") ; too broad?
930 7a5ead65 2020-01-03 op (not (= (point) (point-max))))
931 f8a9db56 2020-01-03 op (when (looking-at ".*url = \\(.*\\)")
932 7a5ead65 2020-01-03 op (setq found (match-string-no-properties 1)))
933 7a5ead65 2020-01-03 op (forward-line))
936 af5ef7cd 2020-11-29 op (provide 'vc-got)
937 af5ef7cd 2020-11-29 op ;;; vc-got.el ends here
