[Emacs-diffs] trunk r114526: New functions for finding the administrative directory in VC.

[Xue Fuqiao]

------------------------------------------------------------
revno: 114526
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Sat 2013-10-05 07:47:00 +0800
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-arch.el             vcarch.el-20091113204419-o5vbwnq5f7feedwu-2971
  lisp/vc/vc-cvs.el              vccvs.el-20091113204419-o5vbwnq5f7feedwu-1927
  lisp/vc/vc-mtn.el              vcmtn.el-20091113204419-o5vbwnq5f7feedwu-7300
  lisp/vc/vc-rcs.el              vcrcs.el-20091113204419-o5vbwnq5f7feedwu-1926
  lisp/vc/vc-svn.el              vcsvn.el-20091113204419-o5vbwnq5f7feedwu-2575
  lisp/vc/vc.el                  vc.el-20091113204419-o5vbwnq5f7feedwu-502

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-04 21:45:37 +0000
+++ b/lisp/ChangeLog    2013-10-04 23:47:00 +0000
@@ -1,3 +1,11 @@
+2013-10-04  Xue Fuqiao  <address@hidden>
+
+       * 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.
+
 2013-10-04  Stefan Monnier  <address@hidden>
 
        * textmodes/css-mode.el (css-smie-rules): Toplevel's a list (bug#15467).

=== modified file 'lisp/vc/vc-arch.el'
--- a/lisp/vc/vc-arch.el        2013-09-04 21:09:42 +0000
+++ b/lisp/vc/vc-arch.el        2013-10-04 23:47:00 +0000
@@ -227,6 +227,10 @@
          (vc-file-setprop
           file 'arch-root root)))))
 
+(defun vc-arch-find-admin-dir (file)
+  "Return the administrative directory of FILE."
+  (expand-file-name "{arch}" (vc-arch-root file)))
+
 (defun vc-arch-register (files &optional rev _comment)
   (if rev (error "Explicit initial revision not supported for Arch"))
   (dolist (file files)

=== modified file 'lisp/vc/vc-cvs.el'
--- a/lisp/vc/vc-cvs.el 2013-09-20 05:39:53 +0000
+++ b/lisp/vc/vc-cvs.el 2013-10-04 23:47:00 +0000
@@ -1226,6 +1226,10 @@
                    table (lambda () (vc-cvs-revision-table (car files))))))
     table))
 
+(defun vc-cvs-find-admin-dir (file)
+  "Return the administrative directory of FILE."
+  (vc-find-root file "CVS"))
+
 (defun vc-cvs-ignore (file &optional _directory _remove)
   "Ignore FILE under CVS."
   (vc-cvs-append-to-ignore (file-name-directory file) file))

=== modified file 'lisp/vc/vc-mtn.el'
--- a/lisp/vc/vc-mtn.el 2013-09-04 21:09:42 +0000
+++ b/lisp/vc/vc-mtn.el 2013-10-04 23:47:00 +0000
@@ -86,6 +86,9 @@
       (vc-file-setprop file 'vc-mtn-root
                        (vc-find-root file vc-mtn-admin-format))))
 
+(defun vc-mtn-find-admin-dir (file)
+  "Return the administrative directory of FILE."
+  (expand-file-name vc-mtn-admin-dir (vc-mtn-root file)))
 
 (defun vc-mtn-registered (file)
   (let ((root (vc-mtn-root file)))

=== modified file 'lisp/vc/vc-rcs.el'
--- a/lisp/vc/vc-rcs.el 2013-09-04 21:09:42 +0000
+++ b/lisp/vc/vc-rcs.el 2013-10-04 23:47:00 +0000
@@ -593,6 +593,10 @@
                        (and newvers (concat "-r" newvers)))
                  (vc-switches 'RCS 'diff))))
 
+(defun vc-rcs-find-admin-dir (file)
+  "Return the administrative directory of FILE."
+  (vc-find-root file "RCS"))
+
 (defun vc-rcs-comment-history (file)
   "Return a string with all log entries stored in BACKEND for FILE."
   (with-current-buffer "*vc*"

=== modified file 'lisp/vc/vc-svn.el'
--- a/lisp/vc/vc-svn.el 2013-09-12 06:55:15 +0000
+++ b/lisp/vc/vc-svn.el 2013-10-04 23:47:00 +0000
@@ -361,6 +361,10 @@
   "Return the list of ignored files."
   )
 
+(defun vc-svn-find-admin-dir (file)
+  "Return the administrative directory of FILE."
+  (expand-file-name vc-svn-admin-directory (vc-svn-root file)))
+
 (defun vc-svn-checkout (file &optional editable rev)
   (message "Checking out %s..." file)
   (with-current-buffer (or (get-file-buffer file) (current-buffer))

=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el     2013-09-21 08:16:13 +0000
+++ b/lisp/vc/vc.el     2013-10-04 23:47:00 +0000
@@ -347,6 +347,10 @@
 ;;
 ;;   Mark conflicts as resolved.  Some VC systems need to run a
 ;;   command to mark conflicts as resolved.
+;;
+;; - find-admin-dir (file)
+;;
+;;   Return the administrative directory of FILE.
 
 ;; HISTORY FUNCTIONS
 ;;