Commit 6a3f9bb7 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* vc-hg.el (vc-hg-state):

* vc-git.el (vc-git-state):
* vc-cvs.el (vc-cvs-parse-status):
* vc-bzr.el (vc-bzr-state): Return 'added when the file is in that
state.
parent 5371d722
2008-03-21 Dan Nicolaescu <dann@ics.uci.edu>
* vc-hg.el (vc-hg-state):
* vc-git.el (vc-git-state):
* vc-cvs.el (vc-cvs-parse-status):
* vc-bzr.el (vc-bzr-state): Return 'added when the file is in that
state.
2008-03-20 Stefan Monnier <monnier@iro.umontreal.ca>
 
* progmodes/compile.el (compile):
......
......@@ -223,7 +223,7 @@ If any error occurred in running `bzr status', then return nil."
(if (cdr result)
(message "Warnings in `bzr' output: %s" (cdr result)))
(cdr (assq (car result)
'((added . edited)
'((added . added)
(kindchanged . edited)
(renamed . edited)
(modified . edited)
......
......@@ -860,6 +860,7 @@ state."
((string-match "Locally Modified" status) 'edited)
((string-match "Needs Merge" status) 'needs-merge)
((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch)
((string-match "Locally Added" status) 'added)
(t 'edited))))))))
(defun vc-cvs-dir-state-heuristic (dir)
......
......@@ -146,9 +146,9 @@
;; FIXME: This can't set 'ignored yet
(vc-git--call nil "add" "--refresh" "--" (file-relative-name file))
(let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--")))
(if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0"
(if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMU]\\)\0[^\0]+\0"
diff))
'edited
(if (string= (match-string 1 diff) "A") 'added 'edited)
'up-to-date)))
(defun vc-git--ls-files-state (state &rest args)
......
......@@ -173,7 +173,7 @@
(let ((state (aref out 0)))
(cond
((eq state ?=) 'up-to-date)
((eq state ?A) 'edited)
((eq state ?A) 'added)
((eq state ?M) 'edited)
((eq state ?I) 'ignored)
((eq state ?R) 'unregistered)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment