diff options
| author | Xue Fuqiao | 2013-10-05 07:47:00 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-10-05 07:47:00 +0800 |
| commit | 34ca0f4c796bca424a0e3033b419eb15b79a2f59 (patch) | |
| tree | c40ad07ca64fa3356c371ac4ace7c9df14d9d9a6 | |
| parent | a27c1b72c5d444f591b179d89ab329faee4555b6 (diff) | |
| download | emacs-34ca0f4c796bca424a0e3033b419eb15b79a2f59.tar.gz emacs-34ca0f4c796bca424a0e3033b419eb15b79a2f59.zip | |
New functions for finding the administrative directory in VC.
* vc/vc-svn.el (vc-svn-find-admin-dir):
* vc/vc-rcs.el (vc-rcs-find-admin-dir):
* vc/vc-mtn.el (vc-mtn-find-admin-dir):
* vc/vc-cvs.el (vc-cvs-find-admin-dir):
* vc/vc-arch.el (vc-arch-find-admin-dir): New functions.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/vc/vc-arch.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-cvs.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-mtn.el | 3 | ||||
| -rw-r--r-- | lisp/vc/vc-rcs.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 4 |
7 files changed, 31 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2f996cba224..427c7394bff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2013-10-04 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * vc/vc-svn.el (vc-svn-find-admin-dir): | ||
| 4 | * vc/vc-rcs.el (vc-rcs-find-admin-dir): | ||
| 5 | * vc/vc-mtn.el (vc-mtn-find-admin-dir): | ||
| 6 | * vc/vc-cvs.el (vc-cvs-find-admin-dir): | ||
| 7 | * vc/vc-arch.el (vc-arch-find-admin-dir): New functions. | ||
| 8 | |||
| 1 | 2013-10-04 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2013-10-04 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 10 | ||
| 3 | * textmodes/css-mode.el (css-smie-rules): Toplevel's a list (bug#15467). | 11 | * textmodes/css-mode.el (css-smie-rules): Toplevel's a list (bug#15467). |
diff --git a/lisp/vc/vc-arch.el b/lisp/vc/vc-arch.el index e9c65b49202..6ef66f2402a 100644 --- a/lisp/vc/vc-arch.el +++ b/lisp/vc/vc-arch.el | |||
| @@ -227,6 +227,10 @@ Only the value `maybe' can be trusted :-(." | |||
| 227 | (vc-file-setprop | 227 | (vc-file-setprop |
| 228 | file 'arch-root root))))) | 228 | file 'arch-root root))))) |
| 229 | 229 | ||
| 230 | (defun vc-arch-find-admin-dir (file) | ||
| 231 | "Return the administrative directory of FILE." | ||
| 232 | (expand-file-name "{arch}" (vc-arch-root file))) | ||
| 233 | |||
| 230 | (defun vc-arch-register (files &optional rev _comment) | 234 | (defun vc-arch-register (files &optional rev _comment) |
| 231 | (if rev (error "Explicit initial revision not supported for Arch")) | 235 | (if rev (error "Explicit initial revision not supported for Arch")) |
| 232 | (dolist (file files) | 236 | (dolist (file files) |
diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index 57e23aba4d9..db3895ccbd1 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el | |||
| @@ -1226,6 +1226,10 @@ is non-nil." | |||
| 1226 | table (lambda () (vc-cvs-revision-table (car files)))))) | 1226 | table (lambda () (vc-cvs-revision-table (car files)))))) |
| 1227 | table)) | 1227 | table)) |
| 1228 | 1228 | ||
| 1229 | (defun vc-cvs-find-admin-dir (file) | ||
| 1230 | "Return the administrative directory of FILE." | ||
| 1231 | (vc-find-root file "CVS")) | ||
| 1232 | |||
| 1229 | (defun vc-cvs-ignore (file &optional _directory _remove) | 1233 | (defun vc-cvs-ignore (file &optional _directory _remove) |
| 1230 | "Ignore FILE under CVS." | 1234 | "Ignore FILE under CVS." |
| 1231 | (vc-cvs-append-to-ignore (file-name-directory file) file)) | 1235 | (vc-cvs-append-to-ignore (file-name-directory file) file)) |
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 56536a26b41..22e4004d49b 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el | |||
| @@ -86,6 +86,9 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 86 | (vc-file-setprop file 'vc-mtn-root | 86 | (vc-file-setprop file 'vc-mtn-root |
| 87 | (vc-find-root file vc-mtn-admin-format)))) | 87 | (vc-find-root file vc-mtn-admin-format)))) |
| 88 | 88 | ||
| 89 | (defun vc-mtn-find-admin-dir (file) | ||
| 90 | "Return the administrative directory of FILE." | ||
| 91 | (expand-file-name vc-mtn-admin-dir (vc-mtn-root file))) | ||
| 89 | 92 | ||
| 90 | (defun vc-mtn-registered (file) | 93 | (defun vc-mtn-registered (file) |
| 91 | (let ((root (vc-mtn-root file))) | 94 | (let ((root (vc-mtn-root file))) |
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index ef1ae8294b2..618250dedab 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el | |||
| @@ -593,6 +593,10 @@ files beneath it." | |||
| 593 | (and newvers (concat "-r" newvers))) | 593 | (and newvers (concat "-r" newvers))) |
| 594 | (vc-switches 'RCS 'diff)))) | 594 | (vc-switches 'RCS 'diff)))) |
| 595 | 595 | ||
| 596 | (defun vc-rcs-find-admin-dir (file) | ||
| 597 | "Return the administrative directory of FILE." | ||
| 598 | (vc-find-root file "RCS")) | ||
| 599 | |||
| 596 | (defun vc-rcs-comment-history (file) | 600 | (defun vc-rcs-comment-history (file) |
| 597 | "Return a string with all log entries stored in BACKEND for FILE." | 601 | "Return a string with all log entries stored in BACKEND for FILE." |
| 598 | (with-current-buffer "*vc*" | 602 | (with-current-buffer "*vc*" |
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 36f27548123..1fd51dd2148 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el | |||
| @@ -361,6 +361,10 @@ FILE is a file wildcard, relative to the root directory of DIRECTORY." | |||
| 361 | "Return the list of ignored files." | 361 | "Return the list of ignored files." |
| 362 | ) | 362 | ) |
| 363 | 363 | ||
| 364 | (defun vc-svn-find-admin-dir (file) | ||
| 365 | "Return the administrative directory of FILE." | ||
| 366 | (expand-file-name vc-svn-admin-directory (vc-svn-root file))) | ||
| 367 | |||
| 364 | (defun vc-svn-checkout (file &optional editable rev) | 368 | (defun vc-svn-checkout (file &optional editable rev) |
| 365 | (message "Checking out %s..." file) | 369 | (message "Checking out %s..." file) |
| 366 | (with-current-buffer (or (get-file-buffer file) (current-buffer)) | 370 | (with-current-buffer (or (get-file-buffer file) (current-buffer)) |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 69098efc50b..13f0d836f91 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -347,6 +347,10 @@ | |||
| 347 | ;; | 347 | ;; |
| 348 | ;; Mark conflicts as resolved. Some VC systems need to run a | 348 | ;; Mark conflicts as resolved. Some VC systems need to run a |
| 349 | ;; command to mark conflicts as resolved. | 349 | ;; command to mark conflicts as resolved. |
| 350 | ;; | ||
| 351 | ;; - find-admin-dir (file) | ||
| 352 | ;; | ||
| 353 | ;; Return the administrative directory of FILE. | ||
| 350 | 354 | ||
| 351 | ;; HISTORY FUNCTIONS | 355 | ;; HISTORY FUNCTIONS |
| 352 | ;; | 356 | ;; |