branch: elpa/vc-fossil
commit b43a7e2da98a3ee2bfae3431aa492808724d9f4e
Author: pdo <pdo>
Commit: pdo <pdo>
Added Emacs 25 compatibility.
---
vc/el/vc-fossil.el | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/vc/el/vc-fossil.el b/vc/el/vc-fossil.el
index 68408a6..f127c43 100644
--- a/vc/el/vc-fossil.el
+++ b/vc/el/vc-fossil.el
@@ -34,12 +34,13 @@
;; STATE-QUERYING FUNCTIONS
;; * registered (file)
;; * state (file) - 'up-to-date 'edited 'needs-patch 'needs-merge
+;; * dir-status-files (dir files uf)
;; * workfile-version (file)
;; * checkout-model (file)
;; - workfile-unchanged-p (file)
;; STATE-CHANGING FUNCTIONS
;; * register (file &optional rev comment)
-;; * checkin (file rev comment)
+;; * checkin (file comment &optional rev)
;; * find-version (file rev buffer)
;; * checkout (file &optional editable rev)
;; * revert (file &optional contents-done)
@@ -47,7 +48,7 @@
;; - responsible-p (file)
;; HISTORY FUNCTIONS
;; * print-log (file &optional buffer)
-;; * diff (file &optional rev1 rev2 buffer)
+;; * diff (file &optional rev1 rev2 buffer async)
;; MISCELLANEOUS
;; - delete-file (file)
;; - rename-file (old new)
@@ -161,9 +162,9 @@ If nil, use the value of `vc-diff-switches'. If t, use no
switches."
(defun vc-fossil-dir-status (dir update-function)
"Get fossil status for all files in a directory"
- (vc-fossil-dir-status-files dir nil nil update-function))
+ (vc-fossil-dir-status-files-i dir nil update-function))
-(defun vc-fossil-dir-status-files (dir files default-state update-function)
+(defun vc-fossil-dir-status-files-i (dir files update-function)
"Get fossil status for all specified files in a directory.
If `files` is nil return the status for all files."
(insert (apply 'vc-fossil--run "update" "-n" "-v" "current"
@@ -193,6 +194,12 @@ If `files` is nil return the status for all files."
(forward-line)))
(funcall update-function result nil)))
+(if (>= emacs-major-version 25)
+ (defun vc-fossil-dir-status-files (dir files update-function)
+ (vc-fossil-dir-status-files-i dir files update-function))
+ (defun vc-fossil-dir-status-files (dir files default-state update-function)
+ (vc-fossil-dir-status-files-i dir files update-function)))
+
(defun vc-fossil-checkout-model (files) 'implicit)
(defun vc-fossil-dir-extra-headers (dir)
@@ -230,7 +237,7 @@ If `files` is nil return the status for all files."
(declare-function log-edit-extract-headers "log-edit" (headers string))
-(defun vc-fossil-checkin (files rev comment)
+(defun vc-fossil-checkin-i (files comment &optional rev)
(apply 'vc-fossil-command nil 0 files
(nconc (list "commit" "-m")
(log-edit-extract-headers
@@ -239,6 +246,12 @@ If `files` is nil return the status for all files."
comment)
(vc-switches 'Fossil 'checkin))))
+(if (>= emacs-major-version 25)
+ (defun vc-fossil-checkin (files comment &optional rev)
+ (vc-fossil-checkin-i files comment rev))
+ (defun vc-fossil-checkin (files rev comment)
+ (vc-fossil-checkin-i files comment rev)))
+
(defun vc-fossil-find-revision (file rev buffer)
(apply #'vc-fossil-command buffer 0 file
"cat"
@@ -332,7 +345,7 @@ Fossil pull command. The default is \"fossil update\"."
(1 'change-log-date))))))
;; TODO: implement diff for directories
-(defun vc-fossil-diff (files &optional rev1 rev2 buffer)
+(defun vc-fossil-diff (files &optional rev1 rev2 buffer async)
"Get Differences for a file"
(let ((buf (or buffer "*vc-diff*"))
(root (and files (expand-file-name (vc-fossil-root (car files))))))
