aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2007-08-03 04:57:05 +0000
committerMiles Bader2007-08-03 04:57:05 +0000
commit4211679b08d6a9c369cb22f085b9bb61d5d4eeda (patch)
treed8a5940250b5728270190e1245278571cfdcace6
parentda435d1cf2b1a368bdd266eecbb8c632f656d614 (diff)
downloademacs-4211679b08d6a9c369cb22f085b9bb61d5d4eeda.tar.gz
emacs-4211679b08d6a9c369cb22f085b9bb61d5d4eeda.zip
Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-842
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/vc-bzr.el12
-rw-r--r--lisp/vc-git.el10
-rw-r--r--lisp/vc-hg.el6
-rw-r--r--lisp/vc-hooks.el4
5 files changed, 27 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b103e096e10..19014a996f9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
12007-08-03 Miles Bader <miles@gnu.org>
2
3 * vc-hooks.el (vc-handled-backends): Change capitalization of VC
4 backend names for new backends to `Git', `Hg', and `Bzr'.
5 * vc-hg.el (vc-hg-dired-state-info): Use `Hg' as VC backend name,
6 not `HG'.
7 * vc-git.el (vc-git-dired-state-info): Use `Git' as VC backend
8 name, not `GIT'.
9 * vc-bzr.el (vc-bzr-dir-state, vc-bzr-dired-state-info)
10 (vc-bzr-unload-hook): Use `Bzr' as VC backend name, not `BZR'.
11
12007-08-03 Glenn Morris <rgm@gnu.org> 122007-08-03 Glenn Morris <rgm@gnu.org>
2 13
3 * cus-edit.el (customize-apropos): Make the error message indicate 14 * cus-edit.el (customize-apropos): Make the error message indicate
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 6a8f930f00f..b2011a7176e 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -63,7 +63,7 @@
63 63
64;; Clear up the cache to force vc-call to check again and discover 64;; Clear up the cache to force vc-call to check again and discover
65;; new functions when we reload this file. 65;; new functions when we reload this file.
66(put 'BZR 'vc-functions nil) 66(put 'Bzr 'vc-functions nil)
67 67
68(defgroup vc-bzr nil 68(defgroup vc-bzr nil
69 "VC bzr backend." 69 "VC bzr backend."
@@ -197,7 +197,7 @@ Return nil if there isn't one."
197 'implicit) 197 'implicit)
198 198
199(defun vc-bzr-create-repo () 199(defun vc-bzr-create-repo ()
200 "Create a new BZR repository." 200 "Create a new Bzr repository."
201 (vc-bzr-command "init" nil 0 nil)) 201 (vc-bzr-command "init" nil 0 nil))
202 202
203(defun vc-bzr-register (files &optional rev comment) 203(defun vc-bzr-register (files &optional rev comment)
@@ -440,7 +440,7 @@ Optional argument LOCALP is always ignored."
440 (vc-file-setprop file 'vc-state 'up-to-date) 440 (vc-file-setprop file 'vc-state 'up-to-date)
441 ;; XXX: is this correct? what happens if one 441 ;; XXX: is this correct? what happens if one
442 ;; mixes different SCMs in the same dir? 442 ;; mixes different SCMs in the same dir?
443 (vc-file-setprop file 'vc-backend 'BZR)))) 443 (vc-file-setprop file 'vc-backend 'Bzr))))
444 ;; `bzr status' reports on added/modified/renamed and unknown/ignored files 444 ;; `bzr status' reports on added/modified/renamed and unknown/ignored files
445 (setq at-start t) 445 (setq at-start t)
446 (with-temp-buffer 446 (with-temp-buffer
@@ -492,18 +492,18 @@ Optional argument LOCALP is always ignored."
492 (if bzr-state 492 (if bzr-state
493 (concat "(" (symbol-name bzr-state) ")") 493 (concat "(" (symbol-name bzr-state) ")")
494 ;; else fall back to default vc representation 494 ;; else fall back to default vc representation
495 (vc-default-dired-state-info 'BZR file))))) 495 (vc-default-dired-state-info 'Bzr file)))))
496 496
497;; In case of just `(load "vc-bzr")', but that's probably the wrong 497;; In case of just `(load "vc-bzr")', but that's probably the wrong
498;; way to do it. 498;; way to do it.
499(add-to-list 'vc-handled-backends 'BZR) 499(add-to-list 'vc-handled-backends 'Bzr)
500 500
501(eval-after-load "vc" 501(eval-after-load "vc"
502 '(add-to-list 'vc-directory-exclusion-list ".bzr" t)) 502 '(add-to-list 'vc-directory-exclusion-list ".bzr" t))
503 503
504(defconst vc-bzr-unload-hook 504(defconst vc-bzr-unload-hook
505 (lambda () 505 (lambda ()
506 (setq vc-handled-backends (delq 'BZR vc-handled-backends)) 506 (setq vc-handled-backends (delq 'Bzr vc-handled-backends))
507 (remove-hook 'vc-post-command-functions 'vc-bzr-post-command-function))) 507 (remove-hook 'vc-post-command-functions 'vc-bzr-post-command-function)))
508 508
509(provide 'vc-bzr) 509(provide 'vc-bzr)
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index e4a9d26105a..156b2866eb9 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -30,11 +30,11 @@
30 30
31;;; Installation: 31;;; Installation:
32 32
33;; To install: put this file on the load-path and add GIT to the list 33;; To install: put this file on the load-path and add Git to the list
34;; of supported backends in `vc-handled-backends'; the following line, 34;; of supported backends in `vc-handled-backends'; the following line,
35;; placed in your ~/.emacs, will accomplish this: 35;; placed in your ~/.emacs, will accomplish this:
36;; 36;;
37;; (add-to-list 'vc-handled-backends 'GIT) 37;; (add-to-list 'vc-handled-backends 'Git)
38 38
39;;; Todo: 39;;; Todo:
40;; - check if more functions could use vc-git-command instead 40;; - check if more functions could use vc-git-command instead
@@ -214,12 +214,12 @@
214 (if (eq git-state 'edited) 214 (if (eq git-state 'edited)
215 "(modified)" 215 "(modified)"
216 ;; fall back to the default VC representation 216 ;; fall back to the default VC representation
217 (vc-default-dired-state-info 'GIT file)))) 217 (vc-default-dired-state-info 'Git file))))
218 218
219;;; STATE-CHANGING FUNCTIONS 219;;; STATE-CHANGING FUNCTIONS
220 220
221(defun vc-git-create-repo () 221(defun vc-git-create-repo ()
222 "Create a new GIT repository." 222 "Create a new Git repository."
223 (vc-git-command "init" nil 0 nil)) 223 (vc-git-command "init" nil 0 nil))
224 224
225(defun vc-git-register (files &optional rev comment) 225(defun vc-git-register (files &optional rev comment)
@@ -287,7 +287,7 @@
287(defvar log-view-file-re) 287(defvar log-view-file-re)
288(defvar log-view-font-lock-keywords) 288(defvar log-view-font-lock-keywords)
289 289
290(define-derived-mode vc-git-log-view-mode log-view-mode "GIT-Log-View" 290(define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View"
291 (require 'add-log) ;; we need the faces add-log 291 (require 'add-log) ;; we need the faces add-log
292 ;; Don't have file markers, so use impossible regexp. 292 ;; Don't have file markers, so use impossible regexp.
293 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") 293 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)")
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index d8a7ec0dd46..1415f8d9499 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -256,7 +256,7 @@
256(defvar log-view-file-re) 256(defvar log-view-file-re)
257(defvar log-view-font-lock-keywords) 257(defvar log-view-font-lock-keywords)
258 258
259(define-derived-mode vc-hg-log-view-mode log-view-mode "HG-Log-View" 259(define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
260 (require 'add-log) ;; we need the faces add-log 260 (require 'add-log) ;; we need the faces add-log
261 ;; Don't have file markers, so use impossible regexp. 261 ;; Don't have file markers, so use impossible regexp.
262 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") 262 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)")
@@ -399,7 +399,7 @@ COMMENT is ignored."
399;; (vc-hg-command nil nil file "remove")) 399;; (vc-hg-command nil nil file "remove"))
400 400
401(defun vc-hg-checkin (files rev comment) 401(defun vc-hg-checkin (files rev comment)
402 "HG-specific version of `vc-backend-checkin'. 402 "Hg-specific version of `vc-backend-checkin'.
403REV is ignored." 403REV is ignored."
404 (vc-hg-command nil 0 files "commit" "-m" comment)) 404 (vc-hg-command nil 0 files "commit" "-m" comment))
405 405
@@ -436,7 +436,7 @@ REV is the revision to check out into WORKFILE."
436 (if (equal (vc-workfile-version file) "0") 436 (if (equal (vc-workfile-version file) "0")
437 "(added)" "(modified)") 437 "(added)" "(modified)")
438 ;; fall back to the default VC representation 438 ;; fall back to the default VC representation
439 (vc-default-dired-state-info 'HG file)))) 439 (vc-default-dired-state-info 'Hg file))))
440 440
441;; Modelled after the similar function in vc-bzr.el 441;; Modelled after the similar function in vc-bzr.el
442(defun vc-hg-revert (file &optional contents-done) 442(defun vc-hg-revert (file &optional contents-done)
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 18083f22e05..09001e59691 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -62,8 +62,8 @@ interpreted as hostnames."
62 :type 'regexp 62 :type 'regexp
63 :group 'vc) 63 :group 'vc)
64 64
65(defcustom vc-handled-backends '(RCS CVS SVN SCCS BZR GIT HG Arch MCVS) 65(defcustom vc-handled-backends '(RCS CVS SVN SCCS Bzr Git Hg Arch MCVS)
66 ;; BZR, GIT, HG, Arch and MCVS come last because they are per-tree 66 ;; Bzr, Git, Hg, Arch and MCVS come last because they are per-tree
67 ;; rather than per-dir. 67 ;; rather than per-dir.
68 "List of version control backends for which VC will be used. 68 "List of version control backends for which VC will be used.
69Entries in this list will be tried in order to determine whether a 69Entries in this list will be tried in order to determine whether a