# HG changeset patch # User Miles Bader # Date 1186117025 0 # Node ID 36893fdf92ab8432a0f038711f352a46615c6dda # Parent 9928f84fd32b64f21e8aebd4bf5bb7d8b0e47668 Change capitalization of VC backend names for new backends Revision: emacs@sv.gnu.org/emacs--devo--0--patch-842 diff -r 9928f84fd32b -r 36893fdf92ab lisp/ChangeLog --- a/lisp/ChangeLog Fri Aug 03 03:21:49 2007 +0000 +++ b/lisp/ChangeLog Fri Aug 03 04:57:05 2007 +0000 @@ -1,3 +1,14 @@ +2007-08-03 Miles Bader + + * vc-hooks.el (vc-handled-backends): Change capitalization of VC + backend names for new backends to `Git', `Hg', and `Bzr'. + * vc-hg.el (vc-hg-dired-state-info): Use `Hg' as VC backend name, + not `HG'. + * vc-git.el (vc-git-dired-state-info): Use `Git' as VC backend + name, not `GIT'. + * vc-bzr.el (vc-bzr-dir-state, vc-bzr-dired-state-info) + (vc-bzr-unload-hook): Use `Bzr' as VC backend name, not `BZR'. + 2007-08-03 Glenn Morris * cus-edit.el (customize-apropos): Make the error message indicate diff -r 9928f84fd32b -r 36893fdf92ab lisp/vc-bzr.el --- a/lisp/vc-bzr.el Fri Aug 03 03:21:49 2007 +0000 +++ b/lisp/vc-bzr.el Fri Aug 03 04:57:05 2007 +0000 @@ -63,7 +63,7 @@ ;; Clear up the cache to force vc-call to check again and discover ;; new functions when we reload this file. -(put 'BZR 'vc-functions nil) +(put 'Bzr 'vc-functions nil) (defgroup vc-bzr nil "VC bzr backend." @@ -197,7 +197,7 @@ 'implicit) (defun vc-bzr-create-repo () - "Create a new BZR repository." + "Create a new Bzr repository." (vc-bzr-command "init" nil 0 nil)) (defun vc-bzr-register (files &optional rev comment) @@ -440,7 +440,7 @@ (vc-file-setprop file 'vc-state 'up-to-date) ;; XXX: is this correct? what happens if one ;; mixes different SCMs in the same dir? - (vc-file-setprop file 'vc-backend 'BZR)))) + (vc-file-setprop file 'vc-backend 'Bzr)))) ;; `bzr status' reports on added/modified/renamed and unknown/ignored files (setq at-start t) (with-temp-buffer @@ -492,18 +492,18 @@ (if bzr-state (concat "(" (symbol-name bzr-state) ")") ;; else fall back to default vc representation - (vc-default-dired-state-info 'BZR file))))) + (vc-default-dired-state-info 'Bzr file))))) ;; In case of just `(load "vc-bzr")', but that's probably the wrong ;; way to do it. -(add-to-list 'vc-handled-backends 'BZR) +(add-to-list 'vc-handled-backends 'Bzr) (eval-after-load "vc" '(add-to-list 'vc-directory-exclusion-list ".bzr" t)) (defconst vc-bzr-unload-hook (lambda () - (setq vc-handled-backends (delq 'BZR vc-handled-backends)) + (setq vc-handled-backends (delq 'Bzr vc-handled-backends)) (remove-hook 'vc-post-command-functions 'vc-bzr-post-command-function))) (provide 'vc-bzr) diff -r 9928f84fd32b -r 36893fdf92ab lisp/vc-git.el --- a/lisp/vc-git.el Fri Aug 03 03:21:49 2007 +0000 +++ b/lisp/vc-git.el Fri Aug 03 04:57:05 2007 +0000 @@ -30,11 +30,11 @@ ;;; Installation: -;; To install: put this file on the load-path and add GIT to the list +;; To install: put this file on the load-path and add Git to the list ;; of supported backends in `vc-handled-backends'; the following line, ;; placed in your ~/.emacs, will accomplish this: ;; -;; (add-to-list 'vc-handled-backends 'GIT) +;; (add-to-list 'vc-handled-backends 'Git) ;;; Todo: ;; - check if more functions could use vc-git-command instead @@ -214,12 +214,12 @@ (if (eq git-state 'edited) "(modified)" ;; fall back to the default VC representation - (vc-default-dired-state-info 'GIT file)))) + (vc-default-dired-state-info 'Git file)))) ;;; STATE-CHANGING FUNCTIONS (defun vc-git-create-repo () - "Create a new GIT repository." + "Create a new Git repository." (vc-git-command "init" nil 0 nil)) (defun vc-git-register (files &optional rev comment) @@ -287,7 +287,7 @@ (defvar log-view-file-re) (defvar log-view-font-lock-keywords) -(define-derived-mode vc-git-log-view-mode log-view-mode "GIT-Log-View" +(define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" (require 'add-log) ;; we need the faces add-log ;; Don't have file markers, so use impossible regexp. (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") diff -r 9928f84fd32b -r 36893fdf92ab lisp/vc-hg.el --- a/lisp/vc-hg.el Fri Aug 03 03:21:49 2007 +0000 +++ b/lisp/vc-hg.el Fri Aug 03 04:57:05 2007 +0000 @@ -256,7 +256,7 @@ (defvar log-view-file-re) (defvar log-view-font-lock-keywords) -(define-derived-mode vc-hg-log-view-mode log-view-mode "HG-Log-View" +(define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View" (require 'add-log) ;; we need the faces add-log ;; Don't have file markers, so use impossible regexp. (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") @@ -399,7 +399,7 @@ ;; (vc-hg-command nil nil file "remove")) (defun vc-hg-checkin (files rev comment) - "HG-specific version of `vc-backend-checkin'. + "Hg-specific version of `vc-backend-checkin'. REV is ignored." (vc-hg-command nil 0 files "commit" "-m" comment)) @@ -436,7 +436,7 @@ (if (equal (vc-workfile-version file) "0") "(added)" "(modified)") ;; fall back to the default VC representation - (vc-default-dired-state-info 'HG file)))) + (vc-default-dired-state-info 'Hg file)))) ;; Modelled after the similar function in vc-bzr.el (defun vc-hg-revert (file &optional contents-done) diff -r 9928f84fd32b -r 36893fdf92ab lisp/vc-hooks.el --- a/lisp/vc-hooks.el Fri Aug 03 03:21:49 2007 +0000 +++ b/lisp/vc-hooks.el Fri Aug 03 04:57:05 2007 +0000 @@ -62,8 +62,8 @@ :type 'regexp :group 'vc) -(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 +(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