diff options
Diffstat (limited to 'lisp/vc-git.el')
| -rw-r--r-- | lisp/vc-git.el | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lisp/vc-git.el b/lisp/vc-git.el index d68b33be76a..4bf6506dcb1 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -53,7 +53,7 @@ ;; * state (file) OK ;; - state-heuristic (file) NOT NEEDED ;; - dir-state (dir) OK -;; * workfile-version (file) OK +;; * working-revision (file) OK ;; - latest-on-branch-p (file) NOT NEEDED ;; * checkout-model (file) OK ;; - workfile-unchanged-p (file) OK @@ -62,13 +62,13 @@ ;; STATE-CHANGING FUNCTIONS ;; * create-repo () OK ;; * register (files &optional rev comment) OK -;; - init-version (file) NOT NEEDED +;; - init-revision (file) NOT NEEDED ;; - responsible-p (file) OK ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD ;; - receive-file (file rev) NOT NEEDED ;; - unregister (file) OK ;; * checkin (files rev comment) OK -;; * find-version (file rev buffer) OK +;; * find-revision (file rev buffer) OK ;; * checkout (file &optional editable rev) OK ;; * revert (file &optional contents-done) OK ;; - rollback (files) COULD BE SUPPORTED @@ -77,11 +77,11 @@ ;; wouldn't be identified as a merge by git, ;; so it's probably not a good idea. ;; - merge-news (file) see `merge' -;; - steal-lock (file &optional version) NOT NEEDED +;; - steal-lock (file &optional revision) NOT NEEDED ;; HISTORY FUNCTIONS ;; * print-log (files &optional buffer) OK ;; - log-view-mode () OK -;; - show-log-entry (version) NOT NEEDED, DEFAULT IS GOOD +;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD ;; - wash-log (file) COULD BE SUPPORTED ;; - logentry-check () NOT NEEDED ;; - comment-history (file) ?? @@ -100,8 +100,8 @@ ;; MISCELLANEOUS ;; - make-version-backups-p (file) NOT NEEDED ;; - repository-hostname (dirname) NOT NEEDED -;; - previous-version (file rev) OK -;; - next-version (file rev) OK +;; - previous-revision (file rev) OK +;; - next-revision (file rev) OK ;; - check-headers () COULD BE SUPPORTED ;; - clear-headers () NOT NEEDED ;; - delete-file (file) OK @@ -177,8 +177,8 @@ (vc-file-setprop file 'vc-state 'nil))) (forward-line))))) -(defun vc-git-workfile-version (file) - "Git-specific version of `vc-workfile-version'." +(defun vc-git-working-revision (file) + "Git-specific version of `vc-working-revision'." (let ((str (with-output-to-string (with-current-buffer standard-output (call-process "git" nil '(t nil) nil "symbolic-ref" "HEAD"))))) @@ -194,7 +194,7 @@ (defun vc-git-mode-line-string (file) "Return string for placement into the modeline for FILE." - (let* ((branch (vc-git-workfile-version file)) + (let* ((branch (vc-git-working-revision file)) (def-ml (vc-default-mode-line-string 'Git file)) (help-echo (get-text-property 0 'help-echo def-ml))) (if (zerop (length branch)) @@ -232,7 +232,7 @@ (let ((coding-system-for-write git-commits-coding-system)) (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) -(defun vc-git-find-version (file rev buffer) +(defun vc-git-find-revision (file rev buffer) (let ((coding-system-for-read 'binary) (coding-system-for-write 'binary) (fullname (substring @@ -372,8 +372,8 @@ ;;; MISCELLANEOUS -(defun vc-git-previous-version (file rev) - "Git-specific version of `vc-previous-version'." +(defun vc-git-previous-revision (file rev) + "Git-specific version of `vc-previous-revision'." (let ((default-directory (file-name-directory (expand-file-name file))) (file (file-name-nondirectory file))) (vc-git-symbolic-commit @@ -390,8 +390,8 @@ (point) (1- (point-max)))))))) -(defun vc-git-next-version (file rev) - "Git-specific version of `vc-next-version'." +(defun vc-git-next-revision (file rev) + "Git-specific version of `vc-next-revision'." (let* ((default-directory (file-name-directory (expand-file-name file))) (file (file-name-nondirectory file)) |