Mercurial > emacs
comparison lisp/vc-git.el @ 85141:b16f7408cd3f
Carry through today's big terminology change to a few places where I
missed it in the back ends.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Wed, 10 Oct 2007 19:39:23 +0000 |
parents | 8ba0e30716a5 |
children | dec6fdd5ddf4 |
comparison
equal
deleted
inserted
replaced
85140:caa57db87d2a | 85141:b16f7408cd3f |
---|---|
75 ;; - merge (file rev1 rev2) It would be possible to merge changes into | 75 ;; - merge (file rev1 rev2) It would be possible to merge changes into |
76 ;; a single file, but when committing they | 76 ;; a single file, but when committing they |
77 ;; wouldn't be identified as a merge by git, | 77 ;; wouldn't be identified as a merge by git, |
78 ;; so it's probably not a good idea. | 78 ;; so it's probably not a good idea. |
79 ;; - merge-news (file) see `merge' | 79 ;; - merge-news (file) see `merge' |
80 ;; - steal-lock (file &optional version) NOT NEEDED | 80 ;; - steal-lock (file &optional revision) NOT NEEDED |
81 ;; HISTORY FUNCTIONS | 81 ;; HISTORY FUNCTIONS |
82 ;; * print-log (files &optional buffer) OK | 82 ;; * print-log (files &optional buffer) OK |
83 ;; - log-view-mode () OK | 83 ;; - log-view-mode () OK |
84 ;; - show-log-entry (version) NOT NEEDED, DEFAULT IS GOOD | 84 ;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD |
85 ;; - wash-log (file) COULD BE SUPPORTED | 85 ;; - wash-log (file) COULD BE SUPPORTED |
86 ;; - logentry-check () NOT NEEDED | 86 ;; - logentry-check () NOT NEEDED |
87 ;; - comment-history (file) ?? | 87 ;; - comment-history (file) ?? |
88 ;; - update-changelog (files) COULD BE SUPPORTED | 88 ;; - update-changelog (files) COULD BE SUPPORTED |
89 ;; * diff (file &optional rev1 rev2 buffer) OK | 89 ;; * diff (file &optional rev1 rev2 buffer) OK |
98 ;; - assign-name (file name) NOT NEEDED | 98 ;; - assign-name (file name) NOT NEEDED |
99 ;; - retrieve-snapshot (dir name update) OK, needs to update buffers | 99 ;; - retrieve-snapshot (dir name update) OK, needs to update buffers |
100 ;; MISCELLANEOUS | 100 ;; MISCELLANEOUS |
101 ;; - make-version-backups-p (file) NOT NEEDED | 101 ;; - make-version-backups-p (file) NOT NEEDED |
102 ;; - repository-hostname (dirname) NOT NEEDED | 102 ;; - repository-hostname (dirname) NOT NEEDED |
103 ;; - previous-version (file rev) OK | 103 ;; - previous-revision (file rev) OK |
104 ;; - next-version (file rev) OK | 104 ;; - next-revision (file rev) OK |
105 ;; - check-headers () COULD BE SUPPORTED | 105 ;; - check-headers () COULD BE SUPPORTED |
106 ;; - clear-headers () NOT NEEDED | 106 ;; - clear-headers () NOT NEEDED |
107 ;; - delete-file (file) OK | 107 ;; - delete-file (file) OK |
108 ;; - rename-file (old new) OK | 108 ;; - rename-file (old new) OK |
109 ;; - find-file-hook () NOT NEEDED | 109 ;; - find-file-hook () NOT NEEDED |
370 )) | 370 )) |
371 | 371 |
372 | 372 |
373 ;;; MISCELLANEOUS | 373 ;;; MISCELLANEOUS |
374 | 374 |
375 (defun vc-git-previous-version (file rev) | 375 (defun vc-git-previous-revision (file rev) |
376 "Git-specific version of `vc-previous-version'." | 376 "Git-specific version of `vc-previous-revision'." |
377 (let ((default-directory (file-name-directory (expand-file-name file))) | 377 (let ((default-directory (file-name-directory (expand-file-name file))) |
378 (file (file-name-nondirectory file))) | 378 (file (file-name-nondirectory file))) |
379 (vc-git-symbolic-commit | 379 (vc-git-symbolic-commit |
380 (with-temp-buffer | 380 (with-temp-buffer |
381 (and | 381 (and |
388 (not (bobp)) | 388 (not (bobp)) |
389 (buffer-substring-no-properties | 389 (buffer-substring-no-properties |
390 (point) | 390 (point) |
391 (1- (point-max)))))))) | 391 (1- (point-max)))))))) |
392 | 392 |
393 (defun vc-git-next-version (file rev) | 393 (defun vc-git-next-revision (file rev) |
394 "Git-specific version of `vc-next-version'." | 394 "Git-specific version of `vc-next-revision'." |
395 (let* ((default-directory (file-name-directory | 395 (let* ((default-directory (file-name-directory |
396 (expand-file-name file))) | 396 (expand-file-name file))) |
397 (file (file-name-nondirectory file)) | 397 (file (file-name-nondirectory file)) |
398 (current-rev | 398 (current-rev |
399 (with-temp-buffer | 399 (with-temp-buffer |