* vc-git.el: Relicense to GPLv3 or later.

(vc-directory-exclusion-list, vc-handled-backends): Remove.

* vc-hooks.el (vc-handled-backends): Add GIT.

* vc.el (vc-directory-exclusion-list): Add .git.

* vc2-xtra.texi (Customizing VC): Add GIT.

diff --git a/etc/NEWS b/etc/NEWS
index 4ec011c07c3572c3f43f815775fb3a98843647a0..21194e24a2fa98a207abf2b606579d946cd42240 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -100,6 +100,8 @@ considered for update.
 
 *** VC has some support for Mercurial (hg).
 
+*** VC has some support for Git.
+
 ** sgml-electric-tag-pair-mode lets you simultaneously edit matched tag pairs.
 
 ** BibTeX mode:

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad836f8ef03676d3f54a5175b086064e4da37d0c..616dfd16859b5ec9b0600fded7b0e479139a2c50 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-26  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-git.el: Relicense to GPLv3 or later.
+       (vc-directory-exclusion-list, vc-handled-backends): Remove.
+       
+       * vc-hooks.el (vc-handled-backends): Add GIT.
+
+       * vc.el (vc-directory-exclusion-list): Add .git.
+
 2007-07-26  Alexandre Julliard  <julliard@winehq.org>
 
        * vc-git.el (vc-git-revision-table)

diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 619199fc287f490ec3f599e4399c55627e668d84..7e358ed023884cd2fd4d0431de8019b31837e9fd 100644 (file)
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -114,12 +114,6 @@
 (defvar git-commits-coding-system 'utf-8
   "Default coding system for git commits.")
 
-;; XXX when this backend is considered sufficiently reliable this
-;; should be moved to vc-hooks.el
-(add-to-list 'vc-handled-backends 'GIT)
-(eval-after-load "vc"
-  '(add-to-list 'vc-directory-exclusion-list ".git" t))
-
 ;;; BACKEND PROPERTIES
 
 (defun vc-git-revision-granularity ()

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 152387516795a8b125369c578aabccaa0c416e94..a8b6297caa2d458e106bbb689096a9edc3e90b96 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -62,9 +62,9 @@ interpreted as hostnames."
   :type 'regexp
   :group 'vc)
 
-(defcustom vc-handled-backends '(RCS CVS SVN SCCS BZR HG Arch MCVS)
-  ;; BZR, HG, Arch and MCVS come last because they are per-tree rather
-  ;; than per-dir.
+(defcustom vc-handled-backends '(RCS CVS SVN SCCS BZR GIT HG Arch MCVS)
+  ;; BZR, GIT, HG, Arch and MCVS come last because they are per-tree
+  ;; rather than per-dir.
   "List of version control backends for which VC will be used.
 Entries in this list will be tried in order to determine whether a
 file is under that sort of version control.

diff --git a/lisp/vc.el b/lisp/vc.el
index 47d231eb2c71bde4e233708aca30fcadc5e096d6..08baa16e6b434ce19e373eee7bb2360a20b06cfa 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -587,7 +587,7 @@ These are passed to the checkin program by \\[vc-register]."
   :version "20.3")
 
 (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".svn" 
-                                        ".hg" ".bzr" "{arch}")
+                                        ".git" ".hg" ".bzr" "{arch}")
   "List of directory names to be ignored when walking directory trees."
   :type '(repeat string)
   :group 'vc)

diff --git a/man/ChangeLog b/man/ChangeLog
index c393eb02589b892782973c0b8542104b83cc8d96..08ba464789a17623526c1184c59121e035f4b151 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,5 +1,7 @@
 2007-07-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * vc2-xtra.texi (Customizing VC): Add GIT.
+
        * dired.texi (Wdired): Mention C-x C-q key binding.
 
 2007-07-25  Glenn Morris  <rgm@gnu.org>

diff --git a/man/vc2-xtra.texi b/man/vc2-xtra.texi
index 7627787d1d2f33d6c361b6a591f1d2deb7dd9dee..83f280887260c423d4f87876075f6c7270fa3ab7 100644 (file)
--- a/man/vc2-xtra.texi
+++ b/man/vc2-xtra.texi
@@ -590,7 +590,7 @@ headers.
 @vindex vc-handled-backends
 The variable @code{vc-handled-backends} determines which version
 control systems VC should handle.  The default value is @code{(RCS CVS
-SVN SCCS BZR HG Arch MCVS)}, so it contains all the version systems
+SVN SCCS BZR GIT HG Arch MCVS)}, so it contains all the version systems
 that are currently supported.  If you want VC to ignore one or more of
 these systems, exclude its name from the list.  To disable VC entirely,
 set this variable to @code{nil}.