Mercurial > emacs
comparison lisp/vc-git.el @ 93124:97c5b398eee4
* vc-hooks.el (vc-default-mode-line-string): Add case for added files.
* vc.el (vc-default-dired-state-info): Use just "modified".
* vc-cvs.el (vc-cvs-state-heuristic): Turn rev 0 into `added'.
(vc-cvs-mode-line-string): Make use of the better default.
(vc-cvs-parse-entry): Use the new `added'.
(vc-cvs-dired-state-info): Remove.
* vc-svn.el (vc-svn-dired-state-info): Remove.
* vc-hg.el (vc-hg-dired-state-info): Remove.
* vc-git.el (vc-git-dired-state-info): Remove.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 21 Mar 2008 17:53:04 +0000 |
parents | 38f18130d057 |
children | 9a34bf3a4363 |
comparison
equal
deleted
inserted
replaced
93123:38f18130d057 | 93124:97c5b398eee4 |
---|---|
197 (concat def-ml "!") | 197 (concat def-ml "!") |
198 'help-echo (concat help-echo "\nNo current branch (detached HEAD)")) | 198 'help-echo (concat help-echo "\nNo current branch (detached HEAD)")) |
199 (propertize def-ml | 199 (propertize def-ml |
200 'help-echo (concat help-echo "\nCurrent branch: " branch))))) | 200 'help-echo (concat help-echo "\nCurrent branch: " branch))))) |
201 | 201 |
202 (defun vc-git-dired-state-info (file) | |
203 "Git-specific version of `vc-dired-state-info'." | |
204 (let ((git-state (vc-state file))) | |
205 (if (eq git-state 'edited) | |
206 "(modified)" | |
207 ;; fall back to the default VC representation | |
208 (vc-default-dired-state-info 'Git file)))) | |
209 | |
210 ;; Variable used to keep the intermediate results for vc-git-status. | 202 ;; Variable used to keep the intermediate results for vc-git-status. |
211 (defvar vc-git-status-result nil) | 203 (defvar vc-git-status-result nil) |
212 | 204 |
213 (defun vc-git-after-dir-status-stage2 (update-function status-buffer) | 205 (defun vc-git-after-dir-status-stage2 (update-function status-buffer) |
214 (goto-char (point-min)) | 206 (goto-char (point-min)) |