Mercurial > emacs
comparison lisp/vc-git.el @ 82091:535e5fa4eca9
vc-git.el (vc-git-checkout, vc-directory-exclusion-list): Fix
typos.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Tue, 24 Jul 2007 13:15:04 +0000 |
parents | cbb38ceb3177 |
children | eabeaae7370e |
comparison
equal
deleted
inserted
replaced
82090:5bc3f262d854 | 82091:535e5fa4eca9 |
---|---|
42 ;; - changelog generation | 42 ;; - changelog generation |
43 ;; - working with revisions other than HEAD | 43 ;; - working with revisions other than HEAD |
44 | 44 |
45 ;; Implement the rest of the vc interface. See the comment at the | 45 ;; Implement the rest of the vc interface. See the comment at the |
46 ;; beginning of vc.el. The current status is: | 46 ;; beginning of vc.el. The current status is: |
47 ;; ("??" means: "figure out what to do about it") | |
47 ;; | 48 ;; |
48 ;; FUNCTION NAME STATUS | 49 ;; FUNCTION NAME STATUS |
49 ;; BACKEND PROPERTIES | 50 ;; BACKEND PROPERTIES |
50 ;; * revision-granularity OK | 51 ;; * revision-granularity OK |
51 ;; STATE-QUERYING FUNCTIONS | 52 ;; STATE-QUERYING FUNCTIONS |
54 ;; - state-heuristic (file) ?? PROBABLY NOT NEEDED | 55 ;; - state-heuristic (file) ?? PROBABLY NOT NEEDED |
55 ;; - dir-state (dir) OK | 56 ;; - dir-state (dir) OK |
56 ;; * workfile-version (file) OK | 57 ;; * workfile-version (file) OK |
57 ;; - latest-on-branch-p (file) ?? | 58 ;; - latest-on-branch-p (file) ?? |
58 ;; * checkout-model (file) OK | 59 ;; * checkout-model (file) OK |
59 ;; - workfile-unchanged-p (file) MAYBE CAN BE SIMPLIFIED | 60 ;; - workfile-unchanged-p (file) OK |
60 ;; - mode-line-string (file) NOT NEEDED | 61 ;; - mode-line-string (file) NOT NEEDED |
61 ;; - dired-state-info (file) OK | 62 ;; - dired-state-info (file) OK |
62 ;; STATE-CHANGING FUNCTIONS | 63 ;; STATE-CHANGING FUNCTIONS |
63 ;; * create-repo () OK | 64 ;; * create-repo () OK |
64 ;; * register (files &optional rev comment) OK | 65 ;; * register (files &optional rev comment) OK |
95 ;; - assign-name (file name) NOT NEEDED | 96 ;; - assign-name (file name) NOT NEEDED |
96 ;; - retrieve-snapshot (dir name update) NEEDED | 97 ;; - retrieve-snapshot (dir name update) NEEDED |
97 ;; MISCELLANEOUS | 98 ;; MISCELLANEOUS |
98 ;; - make-version-backups-p (file) ?? | 99 ;; - make-version-backups-p (file) ?? |
99 ;; - repository-hostname (dirname) ?? | 100 ;; - repository-hostname (dirname) ?? |
100 ;; - previous-version (file rev) ?? | 101 ;; - previous-version (file rev) OK |
101 ;; - next-version (file rev) ?? | 102 ;; - next-version (file rev) OK |
102 ;; - check-headers () ?? | 103 ;; - check-headers () ?? |
103 ;; - clear-headers () ?? | 104 ;; - clear-headers () ?? |
104 ;; - delete-file (file) OK | 105 ;; - delete-file (file) OK |
105 ;; - rename-file (old new) OK | 106 ;; - rename-file (old new) OK |
106 ;; - find-file-hook () PROBABLY NOT NEEDED | 107 ;; - find-file-hook () PROBABLY NOT NEEDED |
113 | 114 |
114 ;; XXX when this backend is considered sufficiently reliable this | 115 ;; XXX when this backend is considered sufficiently reliable this |
115 ;; should be moved to vc-hooks.el | 116 ;; should be moved to vc-hooks.el |
116 (add-to-list 'vc-handled-backends 'GIT) | 117 (add-to-list 'vc-handled-backends 'GIT) |
117 (eval-after-load "vc" | 118 (eval-after-load "vc" |
118 '(add-to-list 'vc-directory-exclusion-list ".bzr" t)) | 119 '(add-to-list 'vc-directory-exclusion-list ".git" t)) |
119 | 120 |
120 ;;; BACKEND PROPERTIES | 121 ;;; BACKEND PROPERTIES |
121 | 122 |
122 (defun vc-git-revision-granularity () | 123 (defun vc-git-revision-granularity () |
123 'repository) | 124 'repository) |
249 (vc-git-command | 250 (vc-git-command |
250 buffer 0 | 251 buffer 0 |
251 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) | 252 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) |
252 | 253 |
253 (defun vc-git-checkout (file &optional editable rev) | 254 (defun vc-git-checkout (file &optional editable rev) |
254 (vc-git-command nil0 file "checkout" (or rev "HEAD"))) | 255 (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) |
255 | 256 |
256 (defun vc-git-revert (file &optional contents-done) | 257 (defun vc-git-revert (file &optional contents-done) |
257 "Revert FILE to the version stored in the git repository." | 258 "Revert FILE to the version stored in the git repository." |
258 (if contents-done | 259 (if contents-done |
259 (vc-git-command nil 0 file "update-index" "--") | 260 (vc-git-command nil 0 file "update-index" "--") |