procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; Update some commentary

Browse source 
* lisp/vc/vc-git.el (vc-git-state): Remove outdated commentary.
(vc-git-dir-status-goto-stage): Move a TODO here.
(vc-git-conflicted-files): From here.
(vc-git-find-file-hook): Add a FIXME.
This commit is contained in:
Dmitry Gutov 2018-06-28 03:05:19 +03:00
parent 4a7f4232ed
commit 7ea0873b4f
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/vc/vc-git.el
View file

@ -298,9 +298,6 @@ in the order given by 'git status'."
'("--ignored")) '("--ignored"))
"--")) "--"))
(status (apply #'vc-git--run-command-string file args))) (status (apply #'vc-git--run-command-string file args)))
;; Alternatively, the `ignored' state could be detected with 'git
;; ls-files -i -o --exclude-standard', but that's an extra process
;; call, and the `ignored' state is rarely needed.
(if (null status) (if (null status)
;; If status is nil, there was an error calling git, likely because ;; If status is nil, there was an error calling git, likely because
;; the file is not in a git repo. ;; the file is not in a git repo.
@ -565,6 +562,7 @@ or an empty string if none."
(declare-function vc-set-async-update "vc-dispatcher" (process-buffer)) (declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
(defun vc-git-dir-status-goto-stage (git-state) (defun vc-git-dir-status-goto-stage (git-state)
;; TODO: Look into reimplementing this using `git status --porcelain=v2'.
(let ((files (vc-git-dir-status-state->files git-state))) (let ((files (vc-git-dir-status-state->files git-state)))
(erase-buffer) (erase-buffer)
(pcase (vc-git-dir-status-state->stage git-state) (pcase (vc-git-dir-status-state->stage git-state)
@ -942,9 +940,6 @@ This prompts for a branch to merge from."
(vc-git--run-command-string directory "status" "--porcelain" "--")) (vc-git--run-command-string directory "status" "--porcelain" "--"))
(lines (when status (split-string status "\n" 'omit-nulls))) (lines (when status (split-string status "\n" 'omit-nulls)))
files) files)
;; TODO: Look into reimplementing `vc-git-state', as well as
;; `vc-git-dir-status-files', based on this output, thus making the
;; extra process call in `vc-git-find-file-hook' unnecessary.
(dolist (line lines files) (dolist (line lines files)
(when (string-match "\\([ MADRCU?!][ MADRCU?!]\\) \\(.+\\)\\(?: -> \\(.+\\)\\)?" (when (string-match "\\([ MADRCU?!][ MADRCU?!]\\) \\(.+\\)\\(?: -> \\(.+\\)\\)?"
line) line)
@ -979,10 +974,11 @@ This prompts for a branch to merge from."
(defun vc-git-find-file-hook () (defun vc-git-find-file-hook ()
"Activate `smerge-mode' if there is a conflict." "Activate `smerge-mode' if there is a conflict."
(when (and buffer-file-name (when (and buffer-file-name
;; FIXME ;; FIXME:
;; 1) the net result is to call git twice per file. ;; 1) the net result is to call git twice per file.
;; 2) v-g-c-f is documented to take a directory. ;; 2) v-g-c-f is documented to take a directory.
;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01126.html ;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01126.html
;; FIXME: vc-git-state can return `conflict' now.
(vc-git-conflicted-files buffer-file-name) (vc-git-conflicted-files buffer-file-name)
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))