mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(vc-git-after-dir-status-stage1): Move state matching

Browse source 
code ...
(vc-git--state-code): ... to this new function.
(vc-git-state): Use it.
This commit is contained in:
Dan Nicolaescu 2008-03-24 08:21:43 +00:00
parent 9c92e9136b
commit 75cb52bed9
2 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/ChangeLog
View file

@ -1,3 +1,10 @@
2008-03-24 Alexandre Julliard <julliard@winehq.org>
* vc-git.el (vc-git-after-dir-status-stage1): Move state matching
code ...
(vc-git--state-code): ... to this new function.
(vc-git-state): Use it.
2008-03-24 Trent Buck <trentbuck@gmail.com> (tiny change)
* textmodes/remember.el (remember-mail-date)

20
lisp/vc-git.el
View file

@ -141,14 +141,23 @@
(string= (substring str 0 (1+ (length name)))
(concat name "\0")))))))))
(defun vc-git--state-code (code)
"Convert from a string to a added/deleted/modified state."
(case (string-to-char code)
(?M 'edited)
(?A 'added)
(?D 'removed)
(?U 'edited) ;; FIXME
(?T 'edited))) ;; FIXME
(defun vc-git-state (file)
"Git-specific version of `vc-state'."
;; 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\\} \\([ADMUT]\\)\0[^\0]+\0"
diff))
(if (string= (match-string 1 diff) "A") 'added 'edited)
(vc-git--state-code (match-string 1 diff))
(if (vc-git--empty-db-p) 'added 'up-to-date))))
(defun vc-git--ls-files-state (state &rest args)
@ -216,12 +225,7 @@
":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0\\([^\0]+\\)\0"
nil t 1)
(let ((filename (match-string 2))
(status (case (string-to-char( match-string 1))
(?M 'edited)
(?A 'added)
(?D 'removed)
(?U 'edited) ;; FIXME
(?T 'edited)))) ;; FIXME
(status (vc-git--state-code (match-string 1))))
(push (cons filename status) vc-git-status-result)))
(erase-buffer)
(vc-git-command (current-buffer) 'async nil "ls-files" "-z" "-o"