New revision in http://www-verimag.imag.fr/~moy/bzr/dvc/moy/
------------------------------------------------------------
revno: 277
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Matthieu Moy <[EMAIL PROTECTED]>
branch nick: moy
timestamp: Mon 2007-10-15 16:15:04 +0200
message:
Oops. My dvc-back-end-wrappers broke dvc-{add,remove,revert}-files.
Most back-ends actually already implemented
<back-end>-{add,remove,revert}-files, so, the autogenerated wrapper was
just overriding them. The back-end specific stuff is now
<back-end>-dvc-{add,remove,revert}-files, and the autogenerated wrapper
is the same without "dvc", so, no name clash.
=== modified file 'docs/DVC-API'
--- a/docs/DVC-API 2007-10-15 09:24:52 +0000
+++ b/docs/DVC-API 2007-10-15 14:15:04 +0000
@@ -146,7 +146,7 @@
* 'sh' is required for dvc-run-sync and dvc-run-async.
- In practice, that is not a problem for Unix users, but requires
+ (In practice, that is not a problem for Unix users, but requires
cygwin or mingw for Windows users. A port of DVC to windows without
these dependancies shouldn't be hard, but none of the developers
- carred enough up to now.
+ carred enough up to now.)
=== modified file 'lisp/bzr-dvc.el'
--- a/lisp/bzr-dvc.el 2007-10-15 09:05:05 +0000
+++ b/lisp/bzr-dvc.el 2007-10-15 14:15:04 +0000
@@ -50,10 +50,6 @@
;;;###autoload
(defalias 'bzr-dvc-add 'bzr-add)
-(defalias 'bzr-dvc-add-files 'bzr-add-files)
-(defalias 'bzr-dvc-revert-files 'bzr-revert-files)
-(defalias 'bzr-dvc-remove-files 'bzr-remove-files)
-
;;;###autoload
(defalias 'bzr-dvc-log-edit-done 'bzr-log-edit-done)
=== modified file 'lisp/bzr.el'
--- a/lisp/bzr.el 2007-09-25 16:26:07 +0000
+++ b/lisp/bzr.el 2007-10-15 14:15:04 +0000
@@ -531,7 +531,8 @@
'bzr (list "add" (file-relative-name file))
:finished 'dvc-output-and-error-buffer-handler))))
-(defun bzr-add-files (&rest files)
+;;;###autoload
+(defun bzr-dvc-add-files (&rest files)
"Run bzr add."
(dvc-trace "bzr-add-files: %s" files)
(let ((default-directory (bzr-tree-root)))
@@ -541,7 +542,8 @@
(output error status arguments)
(message "bzr add finished")))))
-(defun bzr-revert-files (&rest files)
+;;;###autoload
+(defun bzr-dvc-revert-files (&rest files)
"Run bzr revert."
(dvc-trace "bzr-revert-files: %s" files)
(let ((default-directory (bzr-tree-root)))
@@ -550,7 +552,8 @@
(output error status arguments)
(message "bzr revert finished")))))
-(defun bzr-remove-files (&rest files)
+;;;###autoload
+(defun bzr-dvc-remove-files (&rest files)
"Run bzr remove."
(dvc-trace "bzr-remove-files: %s" files)
(dvc-run-dvc-sync 'bzr (append '("remove") files)
=== modified file 'lisp/tla-dvc.el'
--- a/lisp/tla-dvc.el 2007-10-09 15:26:25 +0000
+++ b/lisp/tla-dvc.el 2007-10-15 14:15:04 +0000
@@ -71,8 +71,6 @@
(defun tla-dvc-add (file)
(tla-add nil file))
-(defalias 'tla-dvc-add-files 'tla-add-files)
-
(defun tla-dvc-remove-files (&rest files)
"Call `tla-remove' to remove a list of files."
(apply 'tla-remove nil files))
=== modified file 'lisp/tla.el'
--- a/lisp/tla.el 2007-09-20 18:49:38 +0000
+++ b/lisp/tla.el 2007-10-15 14:15:04 +0000
@@ -5923,7 +5923,8 @@
(tla--run-tla-sync `(,(if (tla-has-add-id-command) "add-id" "add")
,@(when id (list "--id" id)) . ,files)))
-(defun tla-add-files (&rest files)
+;;;###autoload
+(defun tla-dvc-add-files (&rest files)
"Run tla add."
(message "tla-add-files: %s" files)
(dvc-run-dvc-sync tla-arch-branch (append (list (if (tla-has-add-id-command)
"add-id" "add")) files)
=== modified file 'lisp/xdarcs-dvc.el'
--- a/lisp/xdarcs-dvc.el 2007-07-10 21:39:15 +0000
+++ b/lisp/xdarcs-dvc.el 2007-10-15 14:15:04 +0000
@@ -42,12 +42,8 @@
;;;###autoload
(defalias 'xdarcs-dvc-command-version 'xdarcs-command-version)
-(defalias 'xdarcs-dvc-add-files 'xdarcs-add-files)
-
;;;###autoload
(defalias 'xdarcs-dvc-status 'xdarcs-whatsnew)
-(defalias 'xdarcs-dvc-remove-files 'xdarcs-remove-files)
-(defalias 'xdarcs-dvc-revert-files 'xdarcs-revert-files)
(defalias 'xdarcs-dvc-diff 'xdarcs-diff)
=== modified file 'lisp/xdarcs.el'
--- a/lisp/xdarcs.el 2007-09-09 02:46:41 +0000
+++ b/lisp/xdarcs.el 2007-10-15 14:15:04 +0000
@@ -45,7 +45,8 @@
(output error status arguments)
(message "darcs initialize finished")))))
-(defun xdarcs-add-files (&rest files)
+;;;###autoload
+(defun xdarcs-dvc-add-files (&rest files)
"Run darcs add."
(dvc-trace "xdarcs-add-files: %s" files)
(dvc-run-dvc-sync 'xdarcs (append '("add") files)
@@ -218,7 +219,8 @@
;; TODO: remove output-file
))))
-(defun xdarcs-revert-files (&rest files)
+;;;###autoload
+(defun xdarcs-dvc-revert-files (&rest files)
"Run darcs revert."
(dvc-trace "xdarcs-revert-files: %s" files)
(let ((default-directory (xdarcs-tree-root)))
@@ -227,7 +229,8 @@
(output error status arguments)
(message "xdarcs revert finished")))))
-(defun xdarcs-remove-files (&rest files)
+;;;###autoload
+(defun xdarcs-dvc-remove-files (&rest files)
"Run darcs remove."
(dvc-trace "xdarcs-remove-files: %s" files)
(dvc-run-dvc-sync 'xdarcs (append '("remove" "-a") files)
=== modified file 'lisp/xgit-dvc.el'
--- a/lisp/xgit-dvc.el 2007-10-09 15:26:25 +0000
+++ b/lisp/xgit-dvc.el 2007-10-15 14:15:04 +0000
@@ -43,10 +43,6 @@
(defun xgit-dvc-status (&optional path)
(xgit-status))
-(defalias 'xgit-dvc-add-files 'xgit-add-files)
-(defalias 'xgit-dvc-remove-files 'xgit-remove-files)
-(defalias 'xgit-dvc-revert-files 'xgit-revert-files)
-
;;;###autoload
(defalias 'xgit-dvc-command-version 'xgit-command-version)
=== modified file 'lisp/xgit.el'
--- a/lisp/xgit.el 2007-10-08 19:09:31 +0000
+++ b/lisp/xgit.el 2007-10-15 14:15:04 +0000
@@ -64,7 +64,8 @@
(interactive (list (dvc-confirm-read-file-name "Add file or directory: ")))
(xgit-add-files file))
-(defun xgit-add-files (&rest files)
+;;;###autoload
+(defun xgit-dvc-add-files (&rest files)
"Run git add."
(dvc-trace "xgit-add-files: %s" files)
(let ((default-directory (xgit-tree-root)))
@@ -88,7 +89,8 @@
(output error status arguments)
(message "git remove finished")))))
-(defun xgit-remove-files (&rest files)
+;;;###autoload
+(defun xgit-dvc-remove-files (&rest files)
"Run git rm."
(dvc-trace "xgit-remove-files: %s" files)
(dvc-run-dvc-sync 'xgit (nconc (list "rm" "--")
@@ -445,7 +447,8 @@
(interactive "fRevert file: ")
(xgit-revert-files file))
-(defun xgit-revert-files (&rest files)
+;;;###autoload
+(defun xgit-dvc-revert-files (&rest files)
"Revert uncommitted changes made to FILES in the current branch."
(let ((default-directory (xgit-tree-root)))
(setq files (mapcar #'file-relative-name files))
=== modified file 'lisp/xhg-dvc.el'
--- a/lisp/xhg-dvc.el 2007-10-09 15:26:25 +0000
+++ b/lisp/xhg-dvc.el 2007-10-15 14:15:04 +0000
@@ -100,10 +100,6 @@
ARG is passed as prefix argument"
(call-interactively 'xhg-log))
-(defalias 'xhg-dvc-add-files 'xhg-add-files)
-(defalias 'xhg-dvc-revert-files 'xhg-revert-files)
-(defalias 'xhg-dvc-remove-files 'xhg-remove-files)
-
(defun xhg-dvc-rename ()
(interactive)
(call-interactively 'xhg-rename))
=== modified file 'lisp/xhg.el'
--- a/lisp/xhg.el 2007-09-10 19:45:33 +0000
+++ b/lisp/xhg.el 2007-10-15 14:15:04 +0000
@@ -48,7 +48,8 @@
(output error status arguments)
(message "hg init finished"))))
-(defun xhg-add-files (&rest files)
+;;;###autoload
+(defun xhg-dvc-add-files (&rest files)
"Run hg add."
(dvc-trace "xhg-add-files: %s" files)
(let ((default-directory (xhg-tree-root)))
@@ -57,7 +58,8 @@
(output error status arguments)
(message "hg add finished")))))
-(defun xhg-revert-files (&rest files)
+;;;###autoload
+(defun xhg-dvc-revert-files (&rest files)
"Run hg revert."
(dvc-trace "xhg-revert-files: %s" files)
(let ((default-directory (xhg-tree-root)))
@@ -66,7 +68,8 @@
(output error status arguments)
(message "hg revert finished")))))
-(defun xhg-remove-files (&rest files)
+;;;###autoload
+(defun xhg-dvc-remove-files (&rest files)
"Run hg remove."
(dvc-trace "xhg-remove-files: %s" files)
(let ((default-directory (xhg-tree-root)))
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
