[Emacs-diffs] emacs/lisp ChangeLog vc-git.el

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/08/26 06:49:01

Modified files:
        lisp           : ChangeLog vc-git.el 

Log message:
        (vc-git-register): Use "git add" for directories.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16015&r2=1.16016
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-git.el?cvsroot=emacs&r1=1.87&r2=1.88

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16015
retrieving revision 1.16016
diff -u -b -r1.16015 -r1.16016
--- ChangeLog   26 Aug 2009 06:45:36 -0000      1.16015
+++ ChangeLog   26 Aug 2009 06:48:58 -0000      1.16016
@@ -1,5 +1,7 @@
 2009-08-26  Dan Nicolaescu  <address@hidden>
 
+       * vc-git.el (vc-git-register): Use "git add" for directories.
+
        * vc-dir.el (vc-dir-node-directory, vc-dir-update): Get the parent
        directory correctly in case the item is a directory itself.
 

Index: vc-git.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-git.el,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- vc-git.el   25 Aug 2009 09:01:38 -0000      1.87
+++ vc-git.el   26 Aug 2009 06:49:01 -0000      1.88
@@ -77,7 +77,7 @@
 ;; - merge-news (file)                    see `merge'
 ;; - steal-lock (file &optional revision)         NOT NEEDED
 ;; HISTORY FUNCTIONS
-;; * print-log (files &optional buffer)                   OK
+;; * print-log (files &optional buffer shortlog)   OK
 ;; - log-view-mode ()                             OK
 ;; - show-log-entry (revision)                    OK
 ;; - comment-history (file)                       ??
@@ -90,7 +90,7 @@
 ;; - annotate-extract-revision-at-line ()                 OK
 ;; TAG SYSTEM
 ;; - create-tag (dir name branchp)        OK
-;; - retrieve-tag (dir name update)       OK, needs to update buffers
+;; - retrieve-tag (dir name update)                OK
 ;; MISCELLANEOUS
 ;; - make-version-backups-p (file)        NOT NEEDED
 ;; - repository-hostname (dirname)        NOT NEEDED
@@ -426,8 +426,16 @@
   (vc-git-command nil 0 nil "init"))
 
 (defun vc-git-register (files &optional rev comment)
-  "Register FILE into the git version-control system."
-  (vc-git-command nil 0 files "update-index" "--add" "--"))
+  "Register FILES into the git version-control system."
+  (let (flist dlist)
+    (dolist (crt files)
+      (if (file-directory-p crt)
+         (push crt dlist)
+       (push crt flist)))
+    (when flist
+      (vc-git-command nil 0 flist "update-index" "--add" "--"))
+    (when dlist
+      (vc-git-command nil 0 dlist "add"))))
 
 (defalias 'vc-git-responsible-p 'vc-git-root)