Mercurial > emacs
changeset 82145:f04985ac29f2
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 26 Jul 2007 18:44:39 +0000 |
| parents | d334990fbd70 |
| children | 5868631b2e87 |
| files | etc/NEWS lisp/ChangeLog lisp/vc-git.el lisp/vc-hooks.el lisp/vc.el man/ChangeLog man/vc2-xtra.texi |
| diffstat | 7 files changed, 19 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Thu Jul 26 17:26:08 2007 +0000 +++ b/etc/NEWS Thu Jul 26 18:44:39 2007 +0000 @@ -100,6 +100,8 @@ *** 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:
--- a/lisp/ChangeLog Thu Jul 26 17:26:08 2007 +0000 +++ b/lisp/ChangeLog Thu Jul 26 18:44:39 2007 +0000 @@ -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)
--- a/lisp/vc-git.el Thu Jul 26 17:26:08 2007 +0000 +++ b/lisp/vc-git.el Thu Jul 26 18:44:39 2007 +0000 @@ -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 ()
--- a/lisp/vc-hooks.el Thu Jul 26 17:26:08 2007 +0000 +++ b/lisp/vc-hooks.el Thu Jul 26 18:44:39 2007 +0000 @@ -62,9 +62,9 @@ :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.
--- a/lisp/vc.el Thu Jul 26 17:26:08 2007 +0000 +++ b/lisp/vc.el Thu Jul 26 18:44:39 2007 +0000 @@ -587,7 +587,7 @@ :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)
--- a/man/ChangeLog Thu Jul 26 17:26:08 2007 +0000 +++ b/man/ChangeLog Thu Jul 26 18:44:39 2007 +0000 @@ -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>
--- a/man/vc2-xtra.texi Thu Jul 26 17:26:08 2007 +0000 +++ b/man/vc2-xtra.texi Thu Jul 26 18:44:39 2007 +0000 @@ -590,7 +590,7 @@ @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}.