diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-12-29 13:20:49 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-12-29 13:20:49 +0000 |
| commit | 484c1b1f1437aedf152d55be8c6654c30aad181c (patch) | |
| tree | 1f3bbcd636b03adede6437ef805eb7808540685c /lisp/vc-git.el | |
| parent | cfef87adf1b4f4300b9f8f1548a6f2505921fd81 (diff) | |
| download | emacs-484c1b1f1437aedf152d55be8c6654c30aad181c.tar.gz | |
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
and 'unregistered states.
* vc-hooks.el (vc-state): Added 'removed state to documentation.
* vc-hg (vc-hg-parse-status): Recognize 'added, 'removed, and
'up-to-date state. Deal with the possibility that C for clean
might change to "=" in the next point release.
* vc-git.el (vc-git-parse-status): Recognize 'removed.
* vc.el (header comment): Better description of new dir-state.
(vc-compatible-state): Defines which states are mutually
compatible; usable with 'edited as a test for which can be committed on.
(vc-dired-hook): Turn off undo in the VC-Dired buffer, a speed tweak.
(vc-default-dired-state-info): Display 'removed state.
* vc-bzr.el (vc-bzr-dir-state): Recognize 'added.
Diffstat (limited to 'lisp/vc-git.el')
| -rw-r--r-- | lisp/vc-git.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 7895251be0e..1626d5347ee 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -168,19 +168,20 @@ (line-end-position)))) (cond ;; The rest of the possible states in "git ls-files -t" output: - ;; R removed/deleted ;; 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-state 'up-to-date)) + ((eq status-char ?R) + (vc-file-setprop file 'vc-state 'removed)) ((eq status-char ?M) (vc-file-setprop file 'vc-state 'edited)) ((eq status-char ?C) (vc-file-setprop file 'vc-state 'edited)) ((eq status-char ??) (vc-file-setprop file 'vc-backend 'none) - (vc-file-setprop file 'vc-state 'nil))) + (vc-file-setprop file 'vc-state nil))) (forward-line))))) (defun vc-git-working-revision (file) |