[patch] vc-git-dired-state-info buglet

[patch] vc-git-dired-state-info buglet

[Thien-Thi Nguyen]

i think `vc-git-dired-state-info' should call `vc-git-state'
instead of `vc-state'.  here is a recipe: create dir `test',
put it under git version control system, add and commit some
files, then modify a subset of the files.  then do:

C-x v d test RET  ; => empty because no files "locked"
v t               ; => toggle terse mode

before the patch, no files are shown w/ "(modified)" status.
after the patch, some are shown, as i expected.

i wonder if my expectation is incorrect.  comments?

thi


________________________________________________________
*** vc-git.el	20 Oct 2007 01:28:35 -0000	1.25
--- vc-git.el	23 Nov 2007 12:02:57 -0000
***************
*** 205,211 ****
  
  (defun vc-git-dired-state-info (file)
    "Git-specific version of `vc-dired-state-info'."
!   (let ((git-state (vc-state file)))
      (if (eq git-state 'edited)
  	"(modified)"
        ;; fall back to the default VC representation
--- 205,211 ----
  
  (defun vc-git-dired-state-info (file)
    "Git-specific version of `vc-dired-state-info'."
!   (let ((git-state (vc-git-state file)))
      (if (eq git-state 'edited)
  	"(modified)"
        ;; fall back to the default VC representation

Re: [patch] vc-git-dired-state-info buglet

[Alexandre Julliard]

Thien-Thi Nguyen <ttn@gnuvola.org> writes:

> i think `vc-git-dired-state-info' should call `vc-git-state'
> instead of `vc-state'.  here is a recipe: create dir `test',
> put it under git version control system, add and commit some
> files, then modify a subset of the files.  then do:
>
> C-x v d test RET  ; => empty because no files "locked"
> v t               ; => toggle terse mode
>
> before the patch, no files are shown w/ "(modified)" status.
> after the patch, some are shown, as i expected.
>
> i wonder if my expectation is incorrect.  comments?

That's not the real problem, the other backends also use vc-state here
and it works fine. The real problem is that vc-git-dir-state is
broken. Something like this should help:

Index: lisp/vc-git.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-git.el,v
retrieving revision 1.29
diff -u -p -r1.29 vc-git.el
--- lisp/vc-git.el	25 Nov 2007 00:41:49 -0000	1.29
+++ lisp/vc-git.el	27 Nov 2007 21:54:06 -0000
@@ -152,7 +152,7 @@
 
 (defun vc-git-dir-state (dir)
   (with-temp-buffer
-    (vc-git-command (current-buffer) nil nil "ls-files" "-t")
+    (vc-git-command (current-buffer) nil nil "ls-files" "-t" "-c" "-m" "-o")
     (goto-char (point-min))
     (let ((status-char nil)
 	  (file nil))

-- 
Alexandre Julliard
julliard@winehq.org

Re: [patch] vc-git-dired-state-info buglet

[Dan Nicolaescu]

Alexandre Julliard <julliard@winehq.org> writes:

  > Thien-Thi Nguyen <ttn@gnuvola.org> writes:
  > 
  > > i think `vc-git-dired-state-info' should call `vc-git-state'
  > > instead of `vc-state'.  here is a recipe: create dir `test',
  > > put it under git version control system, add and commit some
  > > files, then modify a subset of the files.  then do:
  > >
  > > C-x v d test RET  ; => empty because no files "locked"
  > > v t               ; => toggle terse mode
  > >
  > > before the patch, no files are shown w/ "(modified)" status.
  > > after the patch, some are shown, as i expected.
  > >
  > > i wonder if my expectation is incorrect.  comments?
  > 
  > That's not the real problem, the other backends also use vc-state here
  > and it works fine. The real problem is that vc-git-dir-state is
  > broken. Something like this should help:

Thanks, I've checked in this patch.