1 00713762 2021-08-17 op ;;; vc-got.el --- VC backend for Game of Trees VCS -*- lexical-binding: t; -*-
3 adbe5db0 2021-09-09 op ;; Copyright (C) 2021 Free Software Foundation, Inc.
5 76d978fa 2021-01-05 op ;; Author: Omar Polo <op@omarpolo.com>
6 4b3c0c67 2021-08-17 op ;; Timo Myyrä <timo.myyra@bittivirhe.fi>
7 d3ca33b4 2021-08-16 op ;; URL: https://git.omarpolo.com/vc-got/
8 61b9a83b 2021-08-17 op ;; Keywords: vc tools
9 8fc127f8 2021-09-09 op ;; Version: 1.0
10 3efc7598 2021-09-09 op ;; Package-Requires: ((emacs "25.1"))
12 406d7b4d 2020-12-26 op ;; This program is free software; you can redistribute it and/or modify
13 406d7b4d 2020-12-26 op ;; it under the terms of the GNU General Public License as published by
14 406d7b4d 2020-12-26 op ;; the Free Software Foundation, either version 3 of the License, or
15 406d7b4d 2020-12-26 op ;; (at your option) any later version.
17 406d7b4d 2020-12-26 op ;; This program is distributed in the hope that it will be useful,
18 406d7b4d 2020-12-26 op ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
19 406d7b4d 2020-12-26 op ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 406d7b4d 2020-12-26 op ;; GNU General Public License for more details.
22 406d7b4d 2020-12-26 op ;; You should have received a copy of the GNU General Public License
23 406d7b4d 2020-12-26 op ;; along with this program. If not, see <https://www.gnu.org/licenses/>.
25 7726b6c9 2021-08-10 op ;;; Commentary:
27 186da174 2021-08-17 op ;; This file contains a VC backend for the Game of Trees (got) version
28 186da174 2021-08-17 op ;; control system.
30 af5ef7cd 2020-11-29 op ;; Backend implementation status
32 af5ef7cd 2020-11-29 op ;; Function marked with `*' are required, those with `-' are optional.
34 af5ef7cd 2020-11-29 op ;; FUNCTION NAME STATUS
36 af5ef7cd 2020-11-29 op ;; BACKEND PROPERTIES:
37 af5ef7cd 2020-11-29 op ;; * revision-granularity DONE
38 af5ef7cd 2020-11-29 op ;; - update-on-retrieve-tag XXX: what should this do?
40 af5ef7cd 2020-11-29 op ;; STATE-QUERYING FUNCTIONS:
41 af5ef7cd 2020-11-29 op ;; * registered DONE
42 af5ef7cd 2020-11-29 op ;; * state DONE
43 af5ef7cd 2020-11-29 op ;; - dir-status-files DONE
44 a8466f02 2020-12-07 op ;; - dir-extra-headers DONE
45 2d83de2e 2021-01-05 op ;; - dir-printer DONE
46 af5ef7cd 2020-11-29 op ;; - status-fileinfo-extra NOT IMPLEMENTED
47 af5ef7cd 2020-11-29 op ;; * working-revision DONE
48 af5ef7cd 2020-11-29 op ;; * checkout-model DONE
49 694534b4 2020-12-05 op ;; - mode-line-string DONE
51 23a0b465 2020-11-30 op ;; STATE-CHANGING FUNCTIONS:
52 23a0b465 2020-11-30 op ;; * create-repo NOT IMPLEMENTED
53 eb85ad27 2020-12-05 op ;; I don't think got init does what this function is supposed to
55 23a0b465 2020-11-30 op ;; * register DONE
56 23a0b465 2020-11-30 op ;; - responsible-p DONE
57 3ec8a8b4 2021-08-17 op ;; - receive-file NOT NEEDED, default `register' is fine
58 241a3b12 2021-08-11 op ;; - unregister DONE
59 23a0b465 2020-11-30 op ;; * checkin DONE
60 23a0b465 2020-11-30 op ;; * find-revision DONE
61 eb85ad27 2020-12-05 op ;; * checkout NOT IMPLEMENTED
62 eb85ad27 2020-12-05 op ;; I'm not sure how to properly implement this. Does filling
63 eb85ad27 2020-12-05 op ;; FILE with the find-revision do the trick? Or use got update?
64 eb85ad27 2020-12-05 op ;; * revert DONE
65 eb85ad27 2020-12-05 op ;; - merge-file NOT IMPLEMENTED
66 eb85ad27 2020-12-05 op ;; - merge-branch DONE
67 eb85ad27 2020-12-05 op ;; - merge-news NOT IMPLEMENTED
68 eb85ad27 2020-12-05 op ;; - pull DONE
69 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 3ec8a8b4 2021-08-17 op ;; - rename-file NOT IMPLEMENTED
115 c151c257 2021-08-03 op ;; - find-file-hook DONE
116 3ec8a8b4 2021-08-17 op ;; - extra-menu NOT IMPLEMENTED
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 95a78ecb 2021-08-31 op ;; FIXME: avoid loading this? We only need it for
150 95a78ecb 2021-08-31 op ;; compilation-{directory,arguments}.
151 95a78ecb 2021-08-31 op (require 'compile)
153 95a78ecb 2021-08-31 op ;; FIXME: avoid loading this? We only need it for
154 95a78ecb 2021-08-31 op ;; log-view-{file-re,per-file-logs,message-re}.
155 95a78ecb 2021-08-31 op (require 'log-view)
157 e79563bd 2020-12-31 noreply (defgroup vc-got nil
158 e79563bd 2020-12-31 noreply "VC GoT backend."
159 e79563bd 2020-12-31 noreply :group 'vc)
161 e79563bd 2020-12-31 noreply (defcustom vc-got-program "got"
162 e79563bd 2020-12-31 noreply "Name of the Got executable (excluding any arguments)."
163 6eea6cfb 2021-01-05 op :type 'string)
165 12ca62f2 2020-12-26 op (defcustom vc-got-diff-switches t
166 12ca62f2 2020-12-26 op "String or list of strings specifying switches for Got diff under VC.
167 12ca62f2 2020-12-26 op If nil, use the value of `vc-diff-switches'. If t, use no switches."
168 12ca62f2 2020-12-26 op :type '(choice (const :tag "Unspecified" nil)
169 12ca62f2 2020-12-26 op (const :tag "None" t)
170 12ca62f2 2020-12-26 op (string :tag "Argument String")
171 6eea6cfb 2021-01-05 op (repeat :tag "Argument List" :value ("") string)))
174 95a78ecb 2021-08-31 op (defmacro vc-got--with-emacs-version<= (version &rest body)
175 95a78ecb 2021-08-31 op "Eval BODY only when the Emacs version in greater or equal VERSION."
176 95a78ecb 2021-08-31 op (declare (debug body)
177 95a78ecb 2021-08-31 op (indent defun))
178 95a78ecb 2021-08-31 op (when (version<= version emacs-version)
179 95a78ecb 2021-08-31 op `(progn ,@body)))
181 f09d6359 2020-12-31 noreply (defun vc-got--program-version ()
182 76d978fa 2021-01-05 op "Return string representing the got version."
183 f09d6359 2020-12-31 noreply (let (process-file-side-effects)
184 f09d6359 2020-12-31 noreply (with-temp-buffer
185 f09d6359 2020-12-31 noreply (vc-got--call "-V")
186 f09d6359 2020-12-31 noreply (substring (buffer-string) 4 -1))))
188 af5ef7cd 2020-11-29 op (defun vc-got-root (file)
189 af5ef7cd 2020-11-29 op "Return the work tree root for FILE, or nil."
190 6a973a79 2021-08-11 op (vc-find-root file ".got"))
192 af5ef7cd 2020-11-29 op (defmacro vc-got-with-worktree (file &rest body)
193 af5ef7cd 2020-11-29 op "Evaluate BODY in the work tree directory of FILE."
194 3efc7598 2021-09-09 op (declare (debug t) (indent defun))
195 af5ef7cd 2020-11-29 op `(when-let (default-directory (vc-got-root ,file))
198 686eac9a 2020-12-07 op (defun vc-got--repo-root ()
199 686eac9a 2020-12-07 op "Return the path to the repository root.
200 686eac9a 2020-12-07 op Assume `default-directory' is inside a got worktree."
201 686eac9a 2020-12-07 op (vc-got-with-worktree default-directory
202 686eac9a 2020-12-07 op (with-temp-buffer
203 686eac9a 2020-12-07 op (insert-file-contents ".got/repository")
204 76d978fa 2021-01-05 op (string-trim (buffer-string) "" "\n"))))
206 af5ef7cd 2020-11-29 op (defun vc-got--call (&rest args)
207 76d978fa 2021-01-05 op "Call `vc-got-program' with ARGS.
208 76d978fa 2021-01-05 op The output will be placed in the current buffer."
209 fab791a2 2020-01-03 op (apply #'process-file vc-got-program nil (current-buffer) nil
210 3efc7598 2021-09-09 op (apply #'nconc (mapcar (lambda (s) (if (listp s) s (list s))) args))))
212 23a0b465 2020-11-30 op (defun vc-got--add (files)
213 23a0b465 2020-11-30 op "Add FILES to got, passing `vc-register-switches' to the command invocation."
214 23a0b465 2020-11-30 op (with-temp-buffer
215 c3185bf7 2021-08-11 op (vc-got--call "add" vc-register-switches "--" files)))
217 0a66694e 2020-01-02 op (defun vc-got--log (&optional path limit start-commit stop-commit
218 32819756 2021-09-14 op search-pattern reverse include-diff)
219 76d978fa 2021-01-05 op "Execute the log command in the worktree of PATH in the current buffer.
220 23a0b465 2020-11-30 op LIMIT limits the maximum number of commit returned.
222 518ede14 2020-12-05 op START-COMMIT: start traversing history at the specified commit.
223 9ad1eb5d 2020-12-07 op STOP-COMMIT: stop traversing history at the specified commit.
224 518ede14 2020-12-05 op SEARCH-PATTERN: limit to log messages matched by the regexp given.
225 0a66694e 2020-01-02 op REVERSE: display the log messages in reverse order.
226 32819756 2021-09-14 op INCLUDE-DIFF: display the patch of modifications made in each commit.
228 23a0b465 2020-11-30 op Return nil if the command failed or if PATH isn't included in any
230 3efc7598 2021-09-09 op (let ((process-file-side-effects nil))
231 0a66694e 2020-01-02 op (vc-got-with-worktree (or path default-directory)
233 0a3316a6 2021-02-22 op (save-excursion
234 0a3316a6 2021-02-22 op (vc-got--call "log"
235 3efc7598 2021-09-09 op (and limit (list "-l" (format "%s" limit)))
236 3efc7598 2021-09-09 op (and start-commit (list "-c" start-commit))
237 3efc7598 2021-09-09 op (and stop-commit (list "-x" stop-commit))
238 3efc7598 2021-09-09 op (and search-pattern (list "-s" search-pattern))
239 3efc7598 2021-09-09 op (and reverse '("-R"))
240 32819756 2021-09-14 op (and include-diff '("-p"))
243 0a3316a6 2021-02-22 op (save-excursion
244 3ec8a8b4 2021-08-17 op (delete-matching-lines
245 3ec8a8b4 2021-08-17 op "^-----------------------------------------------$")
248 887e0699 2021-02-22 op (defun vc-got--status (status-codes dir-or-file &optional files)
249 668dc8eb 2021-01-04 op "Return a list of lists '(FILE STATUS STAGE-STATUS).
250 af5ef7cd 2020-11-29 op DIR-OR-FILE can be either a directory or a file. If FILES is
251 af5ef7cd 2020-11-29 op given, return the status of those files, otherwise the status of
252 668dc8eb 2021-01-04 op DIR-OR-FILE. STATUS-CODES is either nil, or a string that's
253 668dc8eb 2021-01-04 op passed as the -s flag to got status to limit the types of status
254 668dc8eb 2021-01-04 op to report (e.g. \"CD\" to report only conflicts and deleted
256 2d039a22 2021-02-21 op (with-temp-buffer
257 2d039a22 2021-02-21 op (let* ((default-directory (expand-file-name
258 2d039a22 2021-02-21 op (if (file-directory-p dir-or-file)
260 2d039a22 2021-02-21 op (file-name-directory dir-or-file))))
261 2d039a22 2021-02-21 op (root (vc-got-root default-directory))
262 2d039a22 2021-02-21 op (process-file-side-effects))
263 2d039a22 2021-02-21 op (when (zerop (vc-got--call "status"
264 3efc7598 2021-09-09 op (and status-codes (list "-s" status-codes))
266 2d039a22 2021-02-21 op (or files dir-or-file)))
267 2d039a22 2021-02-21 op (goto-char (point-min))
268 2d039a22 2021-02-21 op (cl-loop until (eobp)
269 3ec8a8b4 2021-08-17 op collect (vc-got--parse-status-line root)
270 2d039a22 2021-02-21 op do (forward-line))))))
272 3ec8a8b4 2021-08-17 op (defun vc-got--parse-status-line (root)
273 3ec8a8b4 2021-08-17 op "Parse a line of the the output of status.
274 3ec8a8b4 2021-08-17 op ROOT is the root of the repo."
275 3ec8a8b4 2021-08-17 op ;; the format of each line is
276 3ec8a8b4 2021-08-17 op ;; <status-char> <stage-char> <spc> <filename> \n
277 3ec8a8b4 2021-08-17 op (let* ((file-status (prog1 (vc-got--parse-status-char
278 3ec8a8b4 2021-08-17 op (char-after))
279 3ec8a8b4 2021-08-17 op (forward-char)))
280 3ec8a8b4 2021-08-17 op (stage-status (let* ((c (char-after)))
282 3ec8a8b4 2021-08-17 op (when (member c '(?M ?A ?D))
284 3ec8a8b4 2021-08-17 op (forward-char))))
285 3ec8a8b4 2021-08-17 op (filename (progn
286 3ec8a8b4 2021-08-17 op (forward-char)
287 3ec8a8b4 2021-08-17 op (buffer-substring (point)
288 3ec8a8b4 2021-08-17 op (line-end-position)))))
289 3ec8a8b4 2021-08-17 op (list (file-relative-name (expand-file-name filename root)
290 3ec8a8b4 2021-08-17 op default-directory)
291 3ec8a8b4 2021-08-17 op (or file-status (and stage-status 'up-to-date))
292 3ec8a8b4 2021-08-17 op stage-status)))
294 668dc8eb 2021-01-04 op (defun vc-got--parse-status-char (c)
295 668dc8eb 2021-01-04 op "Parse status char C into a symbol accepted by `vc-state'."
299 668dc8eb 2021-01-04 op (?D 'removed)
300 668dc8eb 2021-01-04 op (?C 'conflict)
301 668dc8eb 2021-01-04 op (?! 'missing)
302 76d978fa 2021-01-05 op (?~ 'edited) ; XXX: what does it means for a file to be ``obstructed''?
303 668dc8eb 2021-01-04 op (?? 'unregistered)
304 76d978fa 2021-01-05 op (?m 'edited) ; modified file modes
307 23a0b465 2020-11-30 op (defun vc-got--cat (commit obj-id)
308 23a0b465 2020-11-30 op "Execute got cat -c COMMIT OBJ-ID in the current buffer."
309 76d978fa 2021-01-05 op (let (process-file-side-effects)
310 76d978fa 2021-01-05 op (zerop (vc-got--call "cat" "-c" commit obj-id))))
312 eb85ad27 2020-12-05 op (defun vc-got--revert (&rest files)
313 76d978fa 2021-01-05 op "Execute got revert FILES."
314 eb85ad27 2020-12-05 op (vc-got-with-worktree (car files)
315 eb85ad27 2020-12-05 op (with-temp-buffer
316 c3185bf7 2021-08-11 op (zerop (vc-got--call "revert" "--" files)))))
318 eb85ad27 2020-12-05 op (defun vc-got--list-branches ()
319 eb85ad27 2020-12-05 op "Return an alist of (branch . commit)."
320 76d978fa 2021-01-05 op (let (process-file-side-effects)
321 76d978fa 2021-01-05 op (with-temp-buffer
322 76d978fa 2021-01-05 op (when (zerop (vc-got--call "branch" "-l"))
324 3efc7598 2021-09-09 op (goto-char (point-min))
325 3efc7598 2021-09-09 op (while (re-search-forward "^\\* \\(.+\\): \\([[:word:]]+\\)$" nil t)
326 3efc7598 2021-09-09 op (push (cons (match-string 1) (match-string 2)) alist))
329 694534b4 2020-12-05 op (defun vc-got--current-branch ()
330 694534b4 2020-12-05 op "Return the current branch."
331 76d978fa 2021-01-05 op (let (process-file-side-effects)
332 76d978fa 2021-01-05 op (with-temp-buffer
333 76d978fa 2021-01-05 op (when (zerop (vc-got--call "branch"))
334 76d978fa 2021-01-05 op (string-trim (buffer-string) "" "\n")))))
336 eb85ad27 2020-12-05 op (defun vc-got--integrate (branch)
337 eb85ad27 2020-12-05 op "Integrate BRANCH into the current one."
338 eb85ad27 2020-12-05 op (with-temp-buffer
339 76d978fa 2021-01-05 op (zerop (vc-got--call "integrate" branch))))
341 db89d6fd 2021-08-16 op (defun vc-got--update (branch &optional paths)
342 db89d6fd 2021-08-16 op "Update to a different commit or BRANCH.
343 db89d6fd 2021-08-16 op Optionally restrict the update operation to files at or within
344 db89d6fd 2021-08-16 op the specified PATHS."
345 db89d6fd 2021-08-16 op (with-temp-buffer
346 db89d6fd 2021-08-16 op (unless (zerop (vc-got--call "update" "-b" branch "--" paths))
347 db89d6fd 2021-08-16 op (error "[vc-got] can't update to branch %s: %s"
349 db89d6fd 2021-08-16 op (buffer-string)))))
351 1d573c91 2021-08-17 op (defun vc-got--diff (&rest files)
352 1d573c91 2021-08-17 op "Call got diff against FILES.
353 1d573c91 2021-08-17 op The result will be stored in the current buffer."
354 76d978fa 2021-01-05 op (let (process-file-side-effects)
355 76d978fa 2021-01-05 op (zerop (vc-got--call "diff"
356 76d978fa 2021-01-05 op (vc-switches 'got 'diff)
358 1d573c91 2021-08-17 op (mapcar #'file-relative-name files)))))
360 6b6c8a78 2021-01-04 op (defun vc-got--unstage (file-or-directory)
361 6b6c8a78 2021-01-04 op "Unstage all the staged hunks at or within FILE-OR-DIRECTORY.
362 6b6c8a78 2021-01-04 op If it's nil, unstage every staged changes across the entire work
364 c3185bf7 2021-08-11 op (zerop (vc-got--call "unstage" "--" file-or-directory)))
366 a96df0e8 2020-01-03 noreply (defun vc-got--remove (file &optional force keep-local)
367 76d978fa 2021-01-05 op "Use got to remove FILE.
368 76d978fa 2021-01-05 op If FORCE is non-nil perform the operation even if a file contains
369 76d978fa 2021-01-05 op local modification. If KEEP-LOCAL is non-nil keep the affected
370 76d978fa 2021-01-05 op files on disk."
371 a96df0e8 2020-01-03 noreply (vc-got-with-worktree (or file default-directory)
372 a96df0e8 2020-01-03 noreply (with-temp-buffer
373 76d978fa 2021-01-05 op (zerop (vc-got--call "remove"
374 3efc7598 2021-09-09 op (and force "-f")
375 3efc7598 2021-09-09 op (and keep-local "-k")
379 5fb2f474 2021-08-10 op (defun vc-got--ref ()
380 5fb2f474 2021-08-10 op "Return a list of all references."
381 3efc7598 2021-09-09 op (let ((process-file-side-effects nil)
382 5fb2f474 2021-08-10 op (re "^refs/\\(heads\\|remotes\\|tags\\)/\\(.*\\):")
383 5fb2f474 2021-08-10 op ;; hardcoding HEAD because it's always present and the regexp
384 5fb2f474 2021-08-10 op ;; won't match it.
385 5fb2f474 2021-08-10 op (table (list "HEAD")))
386 5fb2f474 2021-08-10 op (vc-got-with-worktree default-directory
387 5fb2f474 2021-08-10 op (with-temp-buffer
388 5fb2f474 2021-08-10 op (when (zerop (vc-got--call "ref" "-l"))
389 5fb2f474 2021-08-10 op (goto-char (point-min))
390 5fb2f474 2021-08-10 op (while (re-search-forward re nil t)
391 5fb2f474 2021-08-10 op (push (match-string 2) table))
394 8014bde1 2021-08-10 op (defun vc-got--branch (name)
395 8014bde1 2021-08-10 op "Try to create and switch to the branch called NAME."
396 8014bde1 2021-08-10 op (let (process-file-side-effects)
397 8014bde1 2021-08-10 op (vc-got-with-worktree default-directory
398 8014bde1 2021-08-10 op (with-temp-buffer
399 c3185bf7 2021-08-11 op (if (zerop (vc-got--call "branch" "--" name))
401 8014bde1 2021-08-10 op (error "[vc-got] can't create branch %s: %s" name
402 8014bde1 2021-08-10 op (buffer-string)))))))
405 af5ef7cd 2020-11-29 op ;; Backend properties
407 af5ef7cd 2020-11-29 op (defun vc-got-revision-granularity ()
408 af5ef7cd 2020-11-29 op "Got has REPOSITORY granularity."
411 af5ef7cd 2020-11-29 op (defun vc-got-update-on-retrieve-tag ()
412 84beb0d4 2021-08-17 op "Like vc-git, vc-got don't need to buffers on `retrieve-tag'."
416 af5ef7cd 2020-11-29 op ;; State-querying functions
418 af5ef7cd 2020-11-29 op ;;;###autoload (defun vc-got-registered (file)
419 af5ef7cd 2020-11-29 op ;;;###autoload "Return non-nil if FILE is registered with got."
420 af5ef7cd 2020-11-29 op ;;;###autoload (when (vc-find-root file ".got")
421 af5ef7cd 2020-11-29 op ;;;###autoload (load "vc-got" nil t)
422 af5ef7cd 2020-11-29 op ;;;###autoload (vc-got-registered file)))
424 af5ef7cd 2020-11-29 op (defun vc-got-registered (file)
425 af5ef7cd 2020-11-29 op "Return non-nil if FILE is registered with got."
426 af5ef7cd 2020-11-29 op (if (file-directory-p file)
427 76d978fa 2021-01-05 op nil ; got doesn't track directories
428 4093d2f9 2020-12-04 op (when (vc-find-root file ".got")
429 668dc8eb 2021-01-04 op (let ((s (vc-got-state file)))
430 668dc8eb 2021-01-04 op (not (or (eq s 'unregistered)
431 668dc8eb 2021-01-04 op (null s)))))))
433 af5ef7cd 2020-11-29 op (defun vc-got-state (file)
434 af5ef7cd 2020-11-29 op "Return the current version control state of FILE. See `vc-state'."
435 af5ef7cd 2020-11-29 op (unless (file-directory-p file)
436 76d978fa 2021-01-05 op (let (process-file-side-effects)
437 76d978fa 2021-01-05 op ;; Manually calling got status and checking the result inline to
438 76d978fa 2021-01-05 op ;; avoid building the data structure in vc-got--status.
439 76d978fa 2021-01-05 op (with-temp-buffer
440 c3185bf7 2021-08-11 op (when (zerop (vc-got--call "status" "--" file))
441 76d978fa 2021-01-05 op (goto-char (point-min))
444 76d978fa 2021-01-05 op (vc-got--parse-status-char (char-after))))))))
446 dcb5b83a 2021-01-08 op (defun vc-got--dir-filter-files (files)
447 dcb5b83a 2021-01-08 op "Remove ., .. and .got from FILES."
448 dcb5b83a 2021-01-08 op (cl-loop for file in files
449 dcb5b83a 2021-01-08 op unless (or (string= file "..")
450 dcb5b83a 2021-01-08 op (string= file ".")
451 dcb5b83a 2021-01-08 op (string= file ".got"))
452 dcb5b83a 2021-01-08 op collect file))
454 af5ef7cd 2020-11-29 op (defun vc-got-dir-status-files (dir files update-function)
455 5b4a6b90 2021-01-04 op "Build the status for FILES in DIR.
456 76d978fa 2021-01-05 op The builded result is given to the callback UPDATE-FUNCTION. If
457 5b4a6b90 2021-01-04 op FILES is nil, consider all the files in DIR."
458 dcb5b83a 2021-01-08 op (let* ((fs (vc-got--dir-filter-files (or files (directory-files dir))))
459 d346ca63 2021-01-08 op ;; XXX: we call with files, wich will probably be nil on the
460 d346ca63 2021-01-08 op ;; first run, so we catch deleted, missing and edited files
461 d346ca63 2021-01-08 op ;; in subdirectories.
462 d346ca63 2021-01-08 op (res (vc-got--status nil dir files))
463 d346ca63 2021-01-08 op double-check)
464 82289421 2020-01-02 op (cl-loop for file in fs
465 76d978fa 2021-01-05 op do (when (and (not (cdr (assoc file res #'string=)))
466 76d978fa 2021-01-05 op (not (file-directory-p file))
467 76d978fa 2021-01-05 op ;; if file doesn't exists, it's a
468 76d978fa 2021-01-05 op ;; untracked file that was removed.
469 76d978fa 2021-01-05 op (file-exists-p file))
470 d346ca63 2021-01-08 op ;; if we don't know the status of a file here, it's
471 d346ca63 2021-01-08 op ;; either up-to-date or ignored. Save it for a
472 d346ca63 2021-01-08 op ;; double check
473 d346ca63 2021-01-08 op (push file double-check)))
474 cb973832 2021-01-08 op (cl-loop with statuses = (vc-got--status nil dir double-check)
475 cb973832 2021-01-08 op for file in double-check
476 cb973832 2021-01-08 op unless (eq 'unregistered (cadr (assoc file statuses #'string=)))
477 d346ca63 2021-01-08 op do (push (list file 'up-to-date nil) res))
478 d346ca63 2021-01-08 op (funcall update-function res nil)))
480 c27df03e 2020-01-03 op (defun vc-got-dir-extra-headers (dir)
481 c27df03e 2020-01-03 op "Return a string for the `vc-dir' buffer heading for directory DIR."
482 76d978fa 2021-01-05 op (let ((remote (vc-got-repository-url dir)))
483 76d978fa 2021-01-05 op (concat (propertize "Repository : " 'face 'font-lock-type-face)
484 76d978fa 2021-01-05 op (vc-got--repo-root) "\n"
487 76d978fa 2021-01-05 op (propertize "Remote URL : " 'face 'font-lock-type-face)
488 76d978fa 2021-01-05 op (vc-got-repository-url dir) "\n"))
489 76d978fa 2021-01-05 op (propertize "Branch : " 'face 'font-lock-type-face)
490 76d978fa 2021-01-05 op (vc-got--current-branch))))
492 2d83de2e 2021-01-05 op (defun vc-got-dir-printer (info)
493 2d83de2e 2021-01-05 op "Pretty-printer for the vc-dir-fileinfo structure INFO."
494 2d83de2e 2021-01-05 op (let* ((isdir (vc-dir-fileinfo->directory info))
495 76d978fa 2021-01-05 op (state (if isdir "" (vc-dir-fileinfo->state info)))
496 76d978fa 2021-01-05 op (stage-state (vc-dir-fileinfo->extra info))
497 76d978fa 2021-01-05 op (filename (vc-dir-fileinfo->name info)))
501 2d83de2e 2021-01-05 op (format "%c" (if (vc-dir-fileinfo->marked info) ?* ? ))
502 2d83de2e 2021-01-05 op 'face 'font-lock-type-face)
505 1b2afa91 2021-08-17 op (format "%-12s" state)
506 2d83de2e 2021-01-05 op 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
507 76d978fa 2021-01-05 op ((memq state '(missing conflict)) 'font-lock-warning-face)
508 76d978fa 2021-01-05 op ((eq state 'edited) 'font-lock-constant-face)
509 76d978fa 2021-01-05 op (t 'font-lock-variable-name-face))
510 1b2afa91 2021-08-17 op 'mouse-face 'highlight
511 95a78ecb 2021-08-31 op 'keymap (vc-got--with-emacs-version<= "28.0.50"
512 95a78ecb 2021-08-31 op vc-dir-status-mouse-map))
514 1b2afa91 2021-08-17 op " " (propertize
515 1b2afa91 2021-08-17 op (if stage-state
516 1b2afa91 2021-08-17 op (format "%c" stage-state)
518 1b2afa91 2021-08-17 op 'face (cond ((memq stage-state '(?A ?E)) 'font-lock-constant-face)
519 1b2afa91 2021-08-17 op ((eq stage-state ?R) 'font-lock-warning-face)
520 1b2afa91 2021-08-17 op (t 'font-lock-variable-name-face)))
522 1b2afa91 2021-08-17 op (propertize filename
523 1b2afa91 2021-08-17 op 'face (if isdir 'font-lock-comment-delimiter-face
524 1b2afa91 2021-08-17 op 'font-lock-function-name-face)
528 3ec8a8b4 2021-08-17 op "Directory\n"
529 3ec8a8b4 2021-08-17 op "VC operations can be applied to it\n"
530 3ec8a8b4 2021-08-17 op "mouse-3: Pop-up menu")
531 1b2afa91 2021-08-17 op "File\nmouse-3: Pop-up menu")
532 1b2afa91 2021-08-17 op 'mouse-face 'highlight
533 1b2afa91 2021-08-17 op 'keymap vc-dir-filename-mouse-map))))
535 af5ef7cd 2020-11-29 op (defun vc-got-working-revision (file)
536 3ec8a8b4 2021-08-17 op "Return the last commit that touched FILE or \"0\" if it's newly added."
538 af5ef7cd 2020-11-29 op (with-temp-buffer
539 518ede14 2020-12-05 op (when (vc-got--log file 1)
541 af5ef7cd 2020-11-29 op (goto-char (point-min))
542 76d978fa 2021-01-05 op (forward-word) ; skip "commit"
543 76d978fa 2021-01-05 op (forward-char) ; skip the space
544 76d978fa 2021-01-05 op (setq start (point)) ; store start of the SHA
545 76d978fa 2021-01-05 op (forward-word) ; goto SHA end
546 af5ef7cd 2020-11-29 op (buffer-substring start (point)))))
547 af5ef7cd 2020-11-29 op ;; special case: if this file is added but has no previous commits
548 af5ef7cd 2020-11-29 op ;; touching it, got log will fail (as expected), but we have to
549 af5ef7cd 2020-11-29 op ;; return "0".
550 af5ef7cd 2020-11-29 op (when (eq (vc-got-state file) 'added)
553 af5ef7cd 2020-11-29 op (defun vc-got-checkout-model (_files)
554 01bf4e07 2021-08-17 op "Return the checkout model.
555 01bf4e07 2021-08-17 op Got uses an implicit checkout model for every file."
558 694534b4 2020-12-05 op (defun vc-got-mode-line-string (file)
559 694534b4 2020-12-05 op "Return the VC mode line string for FILE."
560 694534b4 2020-12-05 op (vc-got-with-worktree file
561 694534b4 2020-12-05 op (let ((def (vc-default-mode-line-string 'Got file)))
562 694534b4 2020-12-05 op (concat (substring def 0 4) (vc-got--current-branch)))))
565 23a0b465 2020-11-30 op ;; state-changing functions
567 23a0b465 2020-11-30 op (defun vc-got-create-repo (_backend)
568 7726b6c9 2021-08-10 op "Create an empty repository in the current directory."
569 7726b6c9 2021-08-10 op (error "[vc-got] create-repo not implemented"))
571 23a0b465 2020-11-30 op (defun vc-got-register (files &optional _comment)
572 23a0b465 2020-11-30 op "Register FILES, passing `vc-register-switches' to the backend command."
573 23a0b465 2020-11-30 op (vc-got--add files))
575 9e805da8 2020-11-30 op (defalias 'vc-got-responsible-p #'vc-got-root)
577 241a3b12 2021-08-11 op (defun vc-got-unregister (file)
578 241a3b12 2021-08-11 op "Unregister FILE."
579 9114bbc3 2021-08-11 op (vc-got--remove file t t))
581 23a0b465 2020-11-30 op (defun vc-got-checkin (files comment &optional _rev)
582 23a0b465 2020-11-30 op "Commit FILES with COMMENT as commit message."
583 23a0b465 2020-11-30 op (with-temp-buffer
584 ad36649b 2021-02-25 op (unless (zerop (vc-got--call "commit" "-m"
585 e7747ce0 2021-08-11 op (log-edit-extract-headers nil comment)
588 26362bf0 2021-08-11 op (error "[vc-got] can't commit: %s" (buffer-string)))))
590 23a0b465 2020-11-30 op (defun vc-got-find-revision (file rev buffer)
591 c0c9a339 2020-12-04 op "Fill BUFFER with the content of FILE in the given revision REV."
592 961d35b5 2021-09-09 op (with-current-buffer buffer
593 961d35b5 2021-09-09 op (vc-got-with-worktree file
594 961d35b5 2021-09-09 op (vc-got--cat rev (file-relative-name file)))))
596 eb85ad27 2020-12-05 op (defun vc-got-checkout (_file &optional _rev)
597 76d978fa 2021-01-05 op "Checkout revision REV of FILE.
598 76d978fa 2021-01-05 op If REV is t, checkout from the head."
599 7726b6c9 2021-08-10 op (error "[vc-got] checkout not implemented"))
601 eb85ad27 2020-12-05 op (defun vc-got-revert (file &optional _content-done)
602 eb85ad27 2020-12-05 op "Revert FILE back to working revision."
603 eb85ad27 2020-12-05 op (vc-got--revert file))
605 eb85ad27 2020-12-05 op (defun vc-got-merge-branch ()
606 eb85ad27 2020-12-05 op "Prompt for a branch and integrate it into the current one."
607 eb85ad27 2020-12-05 op ;; XXX: be smart and try to "got rebase" if "got integrate" fails?
608 eb85ad27 2020-12-05 op (let* ((branches (cl-loop for (branch . commit) in (vc-got--list-branches)
609 eb85ad27 2020-12-05 op collect branch))
610 eb85ad27 2020-12-05 op (branch (completing-read "Merge from branch: " branches)))
612 eb85ad27 2020-12-05 op (vc-got--integrate branch))))
614 74b00009 2021-08-31 op (defun vc-got--proc-filter (proc s)
615 74b00009 2021-08-31 op "Custom output filter for async process PROC.
616 74b00009 2021-08-31 op It's like `vc-process-filter' but supports \r inside S."
617 74b00009 2021-08-31 op (let ((buffer (process-buffer proc)))
618 74b00009 2021-08-31 op (when (buffer-live-p buffer)
619 74b00009 2021-08-31 op (with-current-buffer buffer
620 74b00009 2021-08-31 op (save-excursion
621 74b00009 2021-08-31 op (let ((buffer-undo-list t)
622 74b00009 2021-08-31 op (inhibit-read-only t))
623 74b00009 2021-08-31 op (goto-char (process-mark proc))
624 74b00009 2021-08-31 op (if (not (string-match ".*\r\\(.*\\)" s))
627 74b00009 2021-08-31 op (end-of-line)
628 74b00009 2021-08-31 op (let ((end (point)))
629 74b00009 2021-08-31 op (beginning-of-line)
630 74b00009 2021-08-31 op (delete-region (point) end))
631 74b00009 2021-08-31 op (insert (match-string 1 s)))
632 74b00009 2021-08-31 op (set-marker (process-mark proc) (point))))))))
634 dec54a74 2021-02-21 op (defun vc-got--push-pull (cmd op prompt)
635 dec54a74 2021-02-21 op "Execute CMD OP, or prompt the user if PROMPT is non-nil."
636 dec54a74 2021-02-21 op (let ((buffer (format "*vc-got : %s*" (expand-file-name default-directory))))
637 686eac9a 2020-12-07 op (when-let (cmd (if prompt
638 686eac9a 2020-12-07 op (split-string
639 686eac9a 2020-12-07 op (read-shell-command (format "%s %s command: " cmd op)
640 1870c8bd 2021-03-27 op (format "%s %s " cmd op))
642 686eac9a 2020-12-07 op (list cmd op)))
643 dec54a74 2021-02-21 op (apply #'vc-do-async-command buffer default-directory cmd)
644 dec54a74 2021-02-21 op ;; this comes from vc-git.el. We're using git to push, so in
645 dec54a74 2021-02-21 op ;; part it makes sense, but we should revisit for full Got
647 dec54a74 2021-02-21 op (with-current-buffer buffer
648 74b00009 2021-08-31 op (vc-compilation-mode 'got)
649 74b00009 2021-08-31 op (let ((comp-cmd (mapconcat #'identity cmd " "))
650 74b00009 2021-08-31 op (proc (get-buffer-process buffer)))
651 95a78ecb 2021-08-31 op (setq-local compile-command comp-cmd)
652 95a78ecb 2021-08-31 op (setq-local compilation-directory default-directory)
653 95a78ecb 2021-08-31 op (setq-local compilation-arguments (list comp-cmd
655 dec54a74 2021-02-21 op (lambda (_ign) buffer)
657 74b00009 2021-08-31 op ;; Setup a custom process filter that handles \r.
658 74b00009 2021-08-31 op (set-process-filter proc #'vc-got--proc-filter)))
659 dec54a74 2021-02-21 op (vc-set-async-update buffer))))
661 3ec8a8b4 2021-08-17 op ;; TODO: this could be expanded. After a pull the worktree needs to
662 3ec8a8b4 2021-08-17 op ;; be updated, either with a ``got update -b branch-name'' and
663 3ec8a8b4 2021-08-17 op ;; eventually a rebase.
664 eb85ad27 2020-12-05 op (defun vc-got-pull (prompt)
665 3ec8a8b4 2021-08-17 op "Execute a pull prompting for the full command if PROMPT is not nil."
666 dec54a74 2021-02-21 op (let ((default-directory (vc-got-root default-directory)))
667 dec54a74 2021-02-21 op (vc-got--push-pull vc-got-program "fetch" prompt)))
669 686eac9a 2020-12-07 op (defun vc-got-push (prompt)
670 686eac9a 2020-12-07 op "Run git push (not got!) in the repository dir.
671 686eac9a 2020-12-07 op If PROMPT is non-nil, prompt for the git command to run."
672 dec54a74 2021-02-21 op (let ((default-directory (vc-got--repo-root)))
673 5154c5c2 2021-08-31 op (vc-got--push-pull vc-got-program "send" prompt)))
676 424f5152 2021-08-10 op ;; History functions
678 eb85ad27 2020-12-05 op (defun vc-got-print-log (files buffer &optional _shortlog start-revision limit)
679 eb85ad27 2020-12-05 op "Insert the revision log for FILES into BUFFER.
680 76d978fa 2021-01-05 op LIMIT limits the number of commits, optionally starting at
681 76d978fa 2021-01-05 op START-REVISION."
682 eb85ad27 2020-12-05 op (with-current-buffer buffer
683 eb85ad27 2020-12-05 op ;; the *vc-diff* may be read only
684 4571b1fd 2020-12-05 op (let ((inhibit-read-only t))
685 eb85ad27 2020-12-05 op (cl-loop for file in files
686 3ec8a8b4 2021-08-17 op do (vc-got--log (file-relative-name file)
688 3ec8a8b4 2021-08-17 op start-revision)))))
690 9ad1eb5d 2020-12-07 op (defun vc-got-log-outgoing (buffer remote-location)
691 9ad1eb5d 2020-12-07 op "Fill BUFFER with the diff between the local worktree branch and REMOTE-LOCATION."
692 9ad1eb5d 2020-12-07 op (vc-setup-buffer buffer)
693 a1839dca 2021-08-17 op (let ((rl (vc-got-next-revision
695 a1839dca 2021-08-17 op (if (or (not remote-location) (string-empty-p remote-location))
696 a1839dca 2021-08-17 op (concat "origin/" (vc-got--current-branch))
697 a1839dca 2021-08-17 op remote-location)))
698 9ad1eb5d 2020-12-07 op (inhibit-read-only t))
699 9ad1eb5d 2020-12-07 op (with-current-buffer buffer
700 9ad1eb5d 2020-12-07 op (vc-got--log nil nil nil rl))))
702 6eda2f1f 2020-12-26 op (defun vc-got-incoming (buffer remote-location)
703 6eda2f1f 2020-12-26 op "Fill BUFFER with the diff between the REMOTE-LOCATION and the local worktree branch."
704 6eda2f1f 2020-12-26 op (let ((rl (if (or (not remote-location) (string-empty-p remote-location))
705 6eda2f1f 2020-12-26 op (concat "origin/" (vc-got--current-branch))
706 6eda2f1f 2020-12-26 op remote-location))
707 6eda2f1f 2020-12-26 op (inhibit-read-only t))
708 6eda2f1f 2020-12-26 op (with-current-buffer buffer
709 6eda2f1f 2020-12-26 op (vc-got--log nil nil (vc-got--current-branch) rl))))
711 eb85ad27 2020-12-05 op (defun vc-got-log-search (buffer pattern)
712 eb85ad27 2020-12-05 op "Search commits for PATTERN and write the results found in BUFFER."
713 eb85ad27 2020-12-05 op (with-current-buffer buffer
714 eb85ad27 2020-12-05 op (let ((inhibit-read-only t))
715 9ad1eb5d 2020-12-07 op (vc-got--log nil nil nil nil pattern))))
717 0a3316a6 2021-02-22 op (define-derived-mode vc-got-log-view-mode log-view-mode "Got-Log-View"
718 0a3316a6 2021-02-22 op "Got-specific log-view mode.
719 0a3316a6 2021-02-22 op Heavily inspired by `vc-git-log-view-mode'."
720 0a3316a6 2021-02-22 op (require 'add-log)
721 95a78ecb 2021-08-31 op (setq-local log-view-file-re regexp-unmatchable)
722 95a78ecb 2021-08-31 op (setq-local log-view-per-file-logs nil)
723 95a78ecb 2021-08-31 op (setq-local log-view-message-re "^commit +\\([0-9a-z]+\\)")
724 95a78ecb 2021-08-31 op (setq-local log-view-font-lock-keywords
726 95a78ecb 2021-08-31 op `((,log-view-message-re (1 'change-log-acknowledgment)))
727 95a78ecb 2021-08-31 op ;; Handle the case:
728 95a78ecb 2021-08-31 op ;; user: foo@bar
729 95a78ecb 2021-08-31 op '(("^from: \\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
730 95a78ecb 2021-08-31 op (1 'change-log-email))
731 95a78ecb 2021-08-31 op ;; Handle the case:
732 95a78ecb 2021-08-31 op ;; user: FirstName LastName <foo@bar>
733 95a78ecb 2021-08-31 op ("^from: \\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
734 95a78ecb 2021-08-31 op (1 'change-log-name)
735 95a78ecb 2021-08-31 op (2 'change-log-email))
736 95a78ecb 2021-08-31 op ("^date: \\(.+\\)" (1 'change-log-date))))))
738 eb85ad27 2020-12-05 op ;; TODO: async
739 f18d3e11 2020-12-05 op ;; TODO: return 0 or 1
740 eb85ad27 2020-12-05 op (defun vc-got-diff (files &optional rev1 rev2 buffer _async)
741 eb85ad27 2020-12-05 op "Insert into BUFFER (or *vc-diff*) the diff for FILES from REV1 to REV2."
742 f457868b 2020-12-07 op (let* ((buffer (get-buffer-create (or buffer "*vc-diff*")))
743 eb85ad27 2020-12-05 op (inhibit-read-only t))
744 eb85ad27 2020-12-05 op (with-current-buffer buffer
745 8ec0bb76 2021-08-11 op (vc-got-with-worktree (or (car files)
746 8ec0bb76 2021-08-11 op default-directory)
747 32819756 2021-09-14 op (cond ((and (null rev1)
749 32819756 2021-09-14 op (dolist (file files)
750 32819756 2021-09-14 op (vc-got--diff file)))
751 32819756 2021-09-14 op ((and (null rev1)
753 32819756 2021-09-14 op ;; TODO: this includes the whole diff while to respect
754 32819756 2021-09-14 op ;; the vc semantics we should filter only the diff for
755 32819756 2021-09-14 op ;; files in FILES.
757 32819756 2021-09-14 op ;; XXX: this includes also the commit message, I
758 32819756 2021-09-14 op ;; consider it a feature over the usual vc behaviour of
759 32819756 2021-09-14 op ;; showing only the diff.
760 32819756 2021-09-14 op (vc-got--log nil 1 rev2 nil nil nil t))
762 32819756 2021-09-14 op ;; TODO: if rev1 is nil, diff from the current version until
765 32819756 2021-09-14 op ;; TODO 2: if rev2 is nil as well, diff against an empty
766 32819756 2021-09-14 op ;; tree (i.e. get the patch from `got log -p rev1')
767 32819756 2021-09-14 op (t (vc-got--diff rev1 rev2)))))))
769 5fb2f474 2021-08-10 op (defun vc-got-revision-completion-table (_files)
770 5fb2f474 2021-08-10 op "Return a completion table for existing revisions.
771 5fb2f474 2021-08-10 op Ignores FILES because GoT doesn't have the concept of ``file
772 5fb2f474 2021-08-10 op revisions''; instead, like with git, you have tags and branches."
773 5fb2f474 2021-08-10 op (letrec ((table (lazy-completion-table
774 5fb2f474 2021-08-10 op table (lambda () (vc-got--ref)))))
777 3f25d9ff 2020-01-02 noreply (defun vc-got-annotate-command (file buf &optional rev)
778 67332bad 2021-01-05 op "Show annotated contents of FILE in buffer BUF. If given, use revision REV."
779 3f25d9ff 2020-01-02 noreply (let (process-file-side-effects)
780 3f25d9ff 2020-01-02 noreply (with-current-buffer buf
781 3f25d9ff 2020-01-02 noreply ;; FIXME: vc-ensure-vc-buffer won't recognise this buffer as managed
782 3f25d9ff 2020-01-02 noreply ;; by got unless vc-parent-buffer points to a buffer managed by got.
783 3f25d9ff 2020-01-02 noreply ;; investigate why this is needed.
784 3efc7598 2021-09-09 op (setq-local vc-parent-buffer (find-file-noselect file))
785 76d978fa 2021-01-05 op (vc-got--call "blame"
786 76d978fa 2021-01-05 op (when rev (list "-c" rev))
790 3f25d9ff 2020-01-02 noreply (defconst vc-got--annotate-re
791 3f25d9ff 2020-01-02 noreply (concat "^[0-9]\\{1,\\}) " ; line number followed by )
792 3f25d9ff 2020-01-02 noreply "\\([a-z0-9]+\\) " ; SHA-1 of commit
793 3f25d9ff 2020-01-02 noreply "\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\) " ; year-mm-dd
794 3f25d9ff 2020-01-02 noreply "\\([^ ]\\)+ ") ; author
795 3f25d9ff 2020-01-02 noreply "Regexp to match annotation output lines.
797 3f25d9ff 2020-01-02 noreply Provides capture groups for:
798 3f25d9ff 2020-01-02 noreply 1. revision id
799 3f25d9ff 2020-01-02 noreply 2. date of commit
800 3f25d9ff 2020-01-02 noreply 3. author of commit")
802 3f25d9ff 2020-01-02 noreply (defconst vc-got--commit-re "^commit \\([a-z0-9]+\\)"
803 3f25d9ff 2020-01-02 noreply "Regexp to match commit lines.
804 3f25d9ff 2020-01-02 noreply Provides capture group for the commit revision id.")
806 3f25d9ff 2020-01-02 noreply (defun vc-got-annotate-time ()
807 3f25d9ff 2020-01-02 noreply "Return the time of the next line of annotation at or after point.
808 3f25d9ff 2020-01-02 noreply Value is returned as floating point fractional number of days."
809 01c0cd8c 2021-09-14 op ;; XXX: to behave like vc-git here we should call re-search-forward
810 01c0cd8c 2021-09-14 op ;; instead of looking-at, as it makes the fontification of the line
811 01c0cd8c 2021-09-14 op ;; start AFTER the info. The problem is, due to the format of the
812 01c0cd8c 2021-09-14 op ;; blame, it produces an ugly result, with colors starting at
813 01c0cd8c 2021-09-14 op ;; different offsets depending on how long the commiter name is.
814 01c0cd8c 2021-09-14 op (when (looking-at vc-got--annotate-re)
815 01c0cd8c 2021-09-14 op (let ((str (match-string-no-properties 2)))
816 01c0cd8c 2021-09-14 op (vc-annotate-convert-time
817 01c0cd8c 2021-09-14 op (encode-time 0 0 0
818 01c0cd8c 2021-09-14 op (string-to-number (substring str 8 10))
819 01c0cd8c 2021-09-14 op (string-to-number (substring str 5 7))
820 01c0cd8c 2021-09-14 op (string-to-number (substring str 0 4)))))))
822 3f25d9ff 2020-01-02 noreply (defun vc-got-annotate-extract-revision-at-line ()
823 67332bad 2021-01-05 op "Return revision corresponding to the current line or nil."
824 3f25d9ff 2020-01-02 noreply (save-excursion
825 3f25d9ff 2020-01-02 noreply (beginning-of-line)
826 3f25d9ff 2020-01-02 noreply (when (looking-at vc-got--annotate-re)
827 3f25d9ff 2020-01-02 noreply (match-string-no-properties 1))))
830 8014bde1 2021-08-10 op ;; Tag system
832 6ab1c7b4 2021-08-11 op (defun vc-got--tag-callback (tag)
833 6ab1c7b4 2021-08-11 op "`log-edit' callback for `vc-got-create-tag'.
834 6ab1c7b4 2021-08-11 op Creates the TAG using the content of the current buffer."
835 6ab1c7b4 2021-08-11 op (interactive)
836 6ab1c7b4 2021-08-11 op (let ((msg (buffer-substring-no-properties (point-min)
837 6ab1c7b4 2021-08-11 op (point-max))))
838 6ab1c7b4 2021-08-11 op (with-temp-buffer
839 3dcaa71b 2021-08-31 op (unless (zerop (vc-got--call "tag"
841 3dcaa71b 2021-08-31 op (log-edit-extract-headers nil msg)
844 6ab1c7b4 2021-08-11 op (error "[vc-got] can't create tag %s: %s" tag (buffer-string))))))
846 8014bde1 2021-08-10 op (defun vc-got-create-tag (_dir name branchp)
847 8014bde1 2021-08-10 op "Attach the tag NAME to the state of the worktree.
848 6ab1c7b4 2021-08-11 op DIR is ignored (tags are global, not per-file). If BRANCHP is
849 6ab1c7b4 2021-08-11 op true, NAME should create a new branch otherwise it will pop-up a
850 6ab1c7b4 2021-08-11 op `log-edit' buffer to provide the tag message."
851 8014bde1 2021-08-10 op ;; TODO: vc reccomends to ensure that all the file are in a clean
852 8014bde1 2021-08-10 op ;; state, but is it useful?
854 8014bde1 2021-08-10 op (vc-got--branch name)
855 6ab1c7b4 2021-08-11 op (let ((buf (get-buffer-create "*vc-got tag*")))
856 6ab1c7b4 2021-08-11 op (with-current-buffer buf
857 6ab1c7b4 2021-08-11 op (erase-buffer)
858 3dcaa71b 2021-08-31 op (save-excursion
859 3dcaa71b 2021-08-31 op (insert "Summary: tag " name "\n\n"))
860 3dcaa71b 2021-08-31 op (move-end-of-line 1)
861 6ab1c7b4 2021-08-11 op (switch-to-buffer buf)
862 6ab1c7b4 2021-08-11 op (log-edit (lambda ()
863 6ab1c7b4 2021-08-11 op (interactive)
864 6ab1c7b4 2021-08-11 op (unwind-protect
865 6ab1c7b4 2021-08-11 op (vc-got--tag-callback name)
866 6ab1c7b4 2021-08-11 op (kill-buffer buf))))))))
868 09d59379 2021-08-11 op (defun vc-got-retrieve-tag (dir name _update)
869 09d59379 2021-08-11 op "Switch to the tag NAME for files at or below DIR."
870 09d59379 2021-08-11 op (let ((default-directory dir))
871 db89d6fd 2021-08-16 op (vc-got--update name dir)))
874 424f5152 2021-08-10 op ;; Miscellaneous
876 2552a6c7 2021-08-11 op (defun vc-got-find-ignore-file (file)
877 2552a6c7 2021-08-11 op "Return the gitignore file that controls FILE."
878 2552a6c7 2021-08-11 op (expand-file-name ".gitignore"
879 2552a6c7 2021-08-11 op (vc-got-root file)))
881 3f25d9ff 2020-01-02 noreply (defun vc-got-previous-revision (file rev)
882 3ec8a8b4 2021-08-17 op "Return the revision number that precedes REV for FILE or nil."
883 3f25d9ff 2020-01-02 noreply (with-temp-buffer
884 3f25d9ff 2020-01-02 noreply (vc-got--log file 2 rev nil nil t)
885 3f25d9ff 2020-01-02 noreply (goto-char (point-min))
886 3f25d9ff 2020-01-02 noreply (keep-lines "^commit")
887 3f25d9ff 2020-01-02 noreply (when (looking-at vc-got--commit-re)
888 3f25d9ff 2020-01-02 noreply (match-string-no-properties 1))))
890 3f25d9ff 2020-01-02 noreply (defun vc-got-next-revision (file rev)
891 3ec8a8b4 2021-08-17 op "Return the revision number that follows REV for FILE or nil."
892 3f25d9ff 2020-01-02 noreply (with-temp-buffer
893 3f25d9ff 2020-01-02 noreply (vc-got--log file nil nil rev)
894 3f25d9ff 2020-01-02 noreply (keep-lines "^commit" (point-min) (point-max))
895 3f25d9ff 2020-01-02 noreply (goto-char (point-max))
896 76d978fa 2021-01-05 op (forward-line -1) ; return from empty line to last actual commit
897 3f25d9ff 2020-01-02 noreply (unless (= (point) (point-min))
898 3f25d9ff 2020-01-02 noreply (forward-line -1)
899 3f25d9ff 2020-01-02 noreply (when (looking-at vc-got--commit-re)
900 3f25d9ff 2020-01-02 noreply (match-string-no-properties 1)))))
902 a96df0e8 2020-01-03 noreply (defun vc-got-delete-file (file)
903 a96df0e8 2020-01-03 noreply "Delete FILE locally and mark it deleted in work tree."
904 a96df0e8 2020-01-03 noreply (vc-got--remove file t))
906 c151c257 2021-08-03 op (defun vc-got-find-file-hook ()
907 c151c257 2021-08-03 op "Activate `smerge-mode' if there is a conflict."
908 c151c257 2021-08-03 op ;; just like vc-git-find-file-hook
909 c151c257 2021-08-03 op (when (and buffer-file-name
910 c151c257 2021-08-03 op (eq (vc-state buffer-file-name 'Got) 'conflict)
911 c151c257 2021-08-03 op (save-excursion
912 c151c257 2021-08-03 op (goto-char (point-min))
913 c151c257 2021-08-03 op (re-search-forward "^<<<<<<< " nil 'noerror)))
914 c151c257 2021-08-03 op (smerge-start-session)
915 c151c257 2021-08-03 op (vc-message-unresolved-conflicts buffer-file-name)))
917 7bb16f79 2020-01-03 op (defun vc-got-conflicted-files (dir)
918 7bb16f79 2020-01-03 op "Return the list of files with conflicts in directory DIR."
919 7bb16f79 2020-01-03 op (let* ((root (vc-got-root dir))
920 7bb16f79 2020-01-03 op (default-directory root)
921 3efc7598 2021-09-09 op (process-file-side-effects nil))
922 3efc7598 2021-09-09 op (cl-loop for (file status _) in (vc-got--status "C" ".")
923 3efc7598 2021-09-09 op when (and (eq status 'conflict)
924 3efc7598 2021-09-09 op (file-in-directory-p file dir))
925 3efc7598 2021-09-09 op collect file)))
927 8b635a9f 2020-01-03 op (defun vc-got-repository-url (_file &optional remote-name)
928 8b635a9f 2020-01-03 op "Return URL for REMOTE-NAME, or for \"origin\" if nil."
929 8b635a9f 2020-01-03 op (let* ((default-directory (vc-got--repo-root))
930 8b635a9f 2020-01-03 op (remote-name (or remote-name "origin"))
931 8b635a9f 2020-01-03 op (heading (concat "[remote \"" remote-name "\"]"))
932 76d978fa 2021-01-05 op (conf (cond ((file-exists-p ".git/config") ".git/config")
933 76d978fa 2021-01-05 op ((file-exists-p ".git") nil)
934 76d978fa 2021-01-05 op ((file-exists-p "config") "config")))
937 6f42ede4 2021-01-05 op (with-temp-buffer
938 f8a9db56 2020-01-03 op (insert-file-contents conf)
939 f8a9db56 2020-01-03 op (goto-char (point-min))
940 f8a9db56 2020-01-03 op (when (search-forward heading nil t)
941 f8a9db56 2020-01-03 op (forward-line)
942 f8a9db56 2020-01-03 op (while (and (not found)
943 76d978fa 2021-01-05 op (looking-at ".*=") ; too broad?
944 7a5ead65 2020-01-03 op (not (= (point) (point-max))))
945 f8a9db56 2020-01-03 op (when (looking-at ".*url = \\(.*\\)")
946 7a5ead65 2020-01-03 op (setq found (match-string-no-properties 1)))
947 7a5ead65 2020-01-03 op (forward-line))
952 a1679b13 2021-09-09 op ;; Automatically register the backend and add ".got" to the exclusion
955 a1679b13 2021-09-09 op ;;;###autoload
956 a1679b13 2021-09-09 op (add-to-list 'vc-handled-backends 'Got)
958 a1679b13 2021-09-09 op ;;;###autoload
959 a1679b13 2021-09-09 op (add-to-list 'vc-directory-exclusion-list ".got")
961 af5ef7cd 2020-11-29 op (provide 'vc-got)
962 af5ef7cd 2020-11-29 op ;;; vc-got.el ends here
