diff options
Diffstat (limited to 'lisp/vc/vc-cvs.el')
| -rw-r--r-- | lisp/vc/vc-cvs.el | 69 |
1 files changed, 30 insertions, 39 deletions
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index a595cc9778b..c8f36fb76ec 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -76,8 +76,7 @@ (repeat :tag "Argument List" :value ("") string)) - :version "22.1" - :group 'vc-cvs) + :version "22.1") (defcustom vc-cvs-register-switches nil "Switches for registering a file into CVS. @@ -88,8 +87,7 @@ If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "21.1" - :group 'vc-cvs) + :version "21.1") (defcustom vc-cvs-diff-switches nil "String or list of strings specifying switches for CVS diff under VC. @@ -98,8 +96,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "21.1" - :group 'vc-cvs) + :version "21.1") (defcustom vc-cvs-annotate-switches nil "String or list of strings specifying switches for cvs annotate under VC. @@ -109,22 +106,19 @@ switches." (const :tag "None" t) (string :tag "Argument String") (repeat :tag "Argument List" :value ("") string)) - :version "25.1" - :group 'vc-cvs) + :version "25.1") (defcustom vc-cvs-header '("$Id\ $") "Header keywords to be inserted by `vc-insert-headers'." :version "24.1" ; no longer consult the obsolete vc-header-alist - :type '(repeat string) - :group 'vc-cvs) + :type '(repeat string)) (defcustom vc-cvs-use-edit t "Non-nil means to use `cvs edit' to \"check out\" a file. This is only meaningful if you don't use the implicit checkout model \(i.e. if you have $CVSREAD set)." :type 'boolean - :version "21.1" - :group 'vc-cvs) + :version "21.1") (defcustom vc-cvs-stay-local 'only-file "Non-nil means use local operations when possible for remote repositories. @@ -151,16 +145,14 @@ except for hosts matched by these regular expressions." (regexp :format " stay local,\n%t: %v" :tag "if it matches") (repeat :format "%v%i\n" :inline t (regexp :tag "or")))) - :version "23.1" - :group 'vc-cvs) + :version "23.1") (defcustom vc-cvs-sticky-date-format-string "%c" "Format string for mode-line display of sticky date. Format is according to `format-time-string'. Only used if `vc-cvs-sticky-tag-display' is t." :type '(string) - :version "22.1" - :group 'vc-cvs) + :version "22.1") (defcustom vc-cvs-sticky-tag-display t "Specify the mode-line display of sticky tags. @@ -198,8 +190,7 @@ displayed. Date and time is displayed for sticky dates. See also variable `vc-cvs-sticky-date-format-string'." :type '(choice boolean function) - :version "22.1" - :group 'vc-cvs) + :version "22.1") ;;; ;;; Internal variables @@ -310,7 +301,7 @@ to the CVS command." (vc-cvs-could-register file) (push (directory-file-name (file-name-directory file)) dirs))) (if dirs (vc-cvs-register dirs))) - (apply 'vc-cvs-command nil 0 files + (apply #'vc-cvs-command nil 0 files "add" (and comment (string-match "[^\t\n ]" comment) (concat "-m" comment)) @@ -346,12 +337,12 @@ its parents." (error "%s is not a valid symbolic tag name" rev) ;; If the input revision is a valid symbolic tag name, we create it ;; as a branch, commit and switch to it. - (apply 'vc-cvs-command nil 0 files "tag" "-b" (list rev)) - (apply 'vc-cvs-command nil 0 files "update" "-r" (list rev)) + (apply #'vc-cvs-command nil 0 files "tag" "-b" (list rev)) + (apply #'vc-cvs-command nil 0 files "update" "-r" (list rev)) (mapc (lambda (file) (vc-file-setprop file 'vc-cvs-sticky-tag rev)) files))) (let ((status (apply - 'vc-cvs-command nil 1 files + #'vc-cvs-command nil 1 files "ci" (if rev (concat "-r" rev)) (concat "-m" (car (log-edit-extract-headers nil comment))) (vc-switches 'CVS 'checkin)))) @@ -378,7 +369,7 @@ its parents." (vc-file-setprop (car files) 'vc-working-revision (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2)) - (mapc 'vc-file-clearprops files)) + (mapc #'vc-file-clearprops files)) ;; Anyway, forget the checkout model of the file, because we might have ;; guessed wrong when we found the file. After commit, we can ;; tell it from the permissions of the file (see @@ -391,7 +382,7 @@ its parents." (vc-cvs-command nil 0 files "update" "-A")))) (defun vc-cvs-find-revision (file rev buffer) - (apply 'vc-cvs-command + (apply #'vc-cvs-command buffer 0 file "-Q" ; suppress diagnostic output "update" @@ -416,7 +407,7 @@ REV is the revision to check out." (if (equal file buffer-file-name) (read-only-mode -1)))) ;; Check out a particular revision (or recreate the file). (vc-file-setprop file 'vc-working-revision nil) - (apply 'vc-cvs-command nil 0 file + (apply #'vc-cvs-command nil 0 file "-w" "update" (when rev @@ -600,7 +591,7 @@ Remaining arguments are ignored." ;; This used to append diff-switches and vc-diff-switches, ;; which was consistent with the vc-diff-switches doc at that ;; time, but not with the actual behavior of any other VC diff. - (apply 'vc-do-command (or buffer "*vc-diff*") 1 "diff" nil + (apply #'vc-do-command (or buffer "*vc-diff*") 1 "diff" nil ;; Not a CVS diff, does not use vc-cvs-diff-switches. (append (vc-switches nil 'diff) (list (file-relative-name file-oldvers) @@ -608,7 +599,7 @@ Remaining arguments are ignored." (setq status 0)) (push file invoke-cvs-diff-list))))) (when invoke-cvs-diff-list - (setq status (apply 'vc-cvs-command (or buffer "*vc-diff*") + (setq status (apply #'vc-cvs-command (or buffer "*vc-diff*") (if async 'async 1) invoke-cvs-diff-list "diff" (and oldvers (concat "-r" oldvers)) @@ -787,7 +778,7 @@ If UPDATE is non-nil, then update (resynch) any affected buffers." "A wrapper around `vc-do-command' for use in vc-cvs.el. The difference to vc-do-command is that this function always invokes `cvs', and that it passes `vc-cvs-global-switches' to it before FLAGS." - (apply 'vc-do-command (or buffer "*vc*") okstatus "cvs" files + (apply #'vc-do-command (or buffer "*vc*") okstatus "cvs" files (if (stringp vc-cvs-global-switches) (cons vc-cvs-global-switches flags) (append vc-cvs-global-switches @@ -816,7 +807,7 @@ individually should stay local." (setq default nil stay-local (cdr stay-local))) (when (consp stay-local) (setq stay-local - (mapconcat 'identity stay-local "\\|"))) + (mapconcat #'identity stay-local "\\|"))) (if (if (string-match stay-local hostname) default (not default)) 'yes 'no)))))))))))) @@ -1047,29 +1038,29 @@ Query all files in DIR if files is nil." (file-error nil)))) (concat (cond (repo - (concat (propertize "Repository : " 'face 'font-lock-type-face) - (propertize repo 'face 'font-lock-variable-name-face))) + (concat (propertize "Repository : " 'face 'vc-dir-header) + (propertize repo 'face 'vc-dir-header-value))) (t "")) (cond (module - (concat (propertize "Module : " 'face 'font-lock-type-face) - (propertize module 'face 'font-lock-variable-name-face))) + (concat (propertize "Module : " 'face 'vc-dir-header) + (propertize module 'face 'vc-dir-header-value))) (t "")) (if (file-readable-p "CVS/Tag") (let ((tag (vc-cvs-file-to-string "CVS/Tag"))) (cond ((string-match "\\`T" tag) - (concat (propertize "Tag : " 'face 'font-lock-type-face) + (concat (propertize "Tag : " 'face 'vc-dir-header) (propertize (substring tag 1) - 'face 'font-lock-variable-name-face))) + 'face 'vc-dir-header-value))) ((string-match "\\`D" tag) - (concat (propertize "Date : " 'face 'font-lock-type-face) + (concat (propertize "Date : " 'face 'vc-dir-header) (propertize (substring tag 1) - 'face 'font-lock-variable-name-face))) + 'face 'vc-dir-header-value))) (t "")))) ;; In CVS, branch is a per-file property, not a per-directory property. ;; We can't really do this here without making dangerous assumptions. - ;;(propertize "Branch: " 'face 'font-lock-type-face) + ;;(propertize "Branch: " 'face 'vc-dir-header) ;;(propertize "ADD CODE TO PRINT THE BRANCH NAME\n" ;; 'face 'font-lock-warning-face) ))) @@ -1182,7 +1173,7 @@ is non-nil." (mtime (file-attribute-modification-time (file-attributes file))) (parsed-time (progn (require 'parse-time) (parse-time-string (concat time " +0000"))))) - (cond ((and (not (string-match "\\+" time)) + (cond ((and (not (string-search "+" time)) (decoded-time-second parsed-time) ;; Compare just the seconds part of the file time, ;; since CVS file time stamp resolution is just 1 second. |