From b936ef8cc215c32d78a24276e8e347ce86efd173 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 3 Jan 2008 06:29:38 +0000 Subject: [PATCH] * vc-git.el (vc-git--ls-files-state): New function. (vc-git-dir-state): Use it instead of processing the status results here. --- lisp/ChangeLog | 6 ++++++ lisp/vc-git.el | 51 ++++++++++++++++++-------------------------------- 2 files changed, 24 insertions(+), 33 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 224a63ed283..06972d33e23 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-01-03 Alexandre Julliard + + * vc-git.el (vc-git--ls-files-state): New function. + (vc-git-dir-state): Use it instead of processing the status + results here. + 2008-01-02 Eric S. Raymond * progmodes/grep.el (grep-find-ignored-directories): Initialize diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 64bcbeb0b2b..c73c458fcb7 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -151,41 +151,26 @@ 'edited 'up-to-date))) -(defun vc-git-dir-state (dir) - "Git-specific version of `dir-state'." - ;; FIXME: This can't set 'ignored yet +(defun vc-git--ls-files-state (state &rest args) + "Set state to STATE on all files found with git-ls-files ARGS." (with-temp-buffer - (vc-git-command (current-buffer) nil nil "ls-files" "-t" "-c" "-m" "-o") + (apply 'vc-git-command (current-buffer) nil nil "ls-files" "-z" args) (goto-char (point-min)) - (let ((status-char nil) - (file nil)) - (while (not (eobp)) - (setq status-char (char-after)) - (setq file - (expand-file-name - (buffer-substring-no-properties (+ (point) 2) - (line-end-position)))) - (cond - ;; The rest of the possible states in "git ls-files -t" output: - ;; K to be killed - ;; should not show up in vc-dired, so don't deal with them - ;; here. - ((eq status-char ?H) - (vc-file-setprop file 'vc-backend 'Git) - (vc-file-setprop file 'vc-state 'up-to-date)) - ((eq status-char ?R) - (vc-file-setprop file 'vc-backend 'Git) - (vc-file-setprop file 'vc-state 'removed)) - ((eq status-char ?M) - (vc-file-setprop file 'vc-backend 'Git) - (vc-file-setprop file 'vc-state 'edited)) - ((eq status-char ?C) - (vc-file-setprop file 'vc-backend 'Git) - (vc-file-setprop file 'vc-state 'edited)) - ((eq status-char ??) - (vc-file-setprop file 'vc-backend 'none) - (vc-file-setprop file 'vc-state nil))) - (forward-line))))) + (let ((start (point))) + (while (search-forward "\0" nil t) + (let ((file (expand-file-name + (buffer-substring-no-properties start (1- (point)))))) + (vc-file-setprop file 'vc-backend (if state 'Git 'none)) + (vc-file-setprop file 'vc-state state)) + (setq start (point)))))) + +(defun vc-git-dir-state (dir) + "Git-specific version of `dir-state'." + (vc-git--ls-files-state 'up-to-date "-c") + (vc-git--ls-files-state 'edited "-m") + (vc-git--ls-files-state 'removed "-d") + (vc-git--ls-files-state 'ignored "-o" "-i" "--exclude-standard") + (vc-git--ls-files-state nil "-o" "--exclude-standard")) (defun vc-git-working-revision (file) "Git-specific version of `vc-working-revision'." -- 2.39.2