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