diff options
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 1 | ||||
| -rw-r--r-- | lisp/vc-git.el | 6 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 6 | ||||
| -rw-r--r-- | lisp/vc-mcvs.el | 13 | ||||
| -rw-r--r-- | lisp/vc-mtn.el | 1 | ||||
| -rw-r--r-- | lisp/vc-svn.el | 4 |
7 files changed, 11 insertions, 29 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index af893e71636..26ace243600 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,14 @@ 2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> + * vc-bzr.el (vc-bzr-diff-tree): + * vc-git.el (vc-git-diff-tree): + * vc-hg.el (vc-hg-diff-tree): + * vc-mcvs.el (vc-mcvs-diff-tree): + * vc-mtn.el (vc-mtn-diff-tree): + * vc-svn.el (vc-svn-diff-tree): Remove. + +2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> + * vc-mtn.el (vc-mtn-revision-completion-table): * vc-cvs.el (vc-cvs-revision-completion-table): * vc-arch.el (vc-arch-revision-completion-table): diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index 5ed46431fda..801e1942cb6 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el @@ -391,7 +391,6 @@ EDITABLE is ignored." (list "-r" (format "%s..%s" rev1 rev2)) (list "-r" rev1)))))) -(defalias 'vc-bzr-diff-tree 'vc-bzr-diff) ;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with diff --git a/lisp/vc-git.el b/lisp/vc-git.el index d98afa3de17..07714b26c32 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -87,8 +87,7 @@ ;; - comment-history (file) ?? ;; - update-changelog (files) COULD BE SUPPORTED ;; * diff (file &optional rev1 rev2 buffer) OK -;; - revision-completion-table (file) NEEDED? -;; - diff-tree (dir &optional rev1 rev2) OK +;; - revision-completion-table (files) NEEDED? ;; - annotate-command (file buf &optional rev) OK ;; - annotate-time () OK ;; - annotate-current-time () NOT NEEDED @@ -336,9 +335,6 @@ table (lambda () (vc-git-revision-table files)))) table)) -(defun vc-git-diff-tree (dir &optional rev1 rev2) - (vc-git-diff dir rev1 rev2)) - (defun vc-git-annotate-command (file buf &optional rev) ;; FIXME: rev is ignored (let ((name (file-relative-name file))) diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 8e9cf15688b..872be45a2c1 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -76,8 +76,7 @@ ;; - comment-history (file) NOT NEEDED ;; - update-changelog (files) NOT NEEDED ;; * diff (files &optional rev1 rev2 buffer) OK -;; - revision-completion-table (file) COMMENTED OUT AS A WORKAROUND FOR A BUG -;; - diff-tree (dir &optional rev1 rev2) TEST IT +;; - revision-completion-table (files) OK? ;; - annotate-command (file buf &optional rev) OK ;; - annotate-time () OK ;; - annotate-current-time () ?? NOT NEEDED @@ -309,9 +308,6 @@ table (lambda () (vc-hg-revision-table files)))) table)) -(defun vc-hg-diff-tree (file &optional oldvers newvers buffer) - (vc-hg-diff (list file) oldvers newvers buffer)) - (defun vc-hg-annotate-command (file buffer &optional revision) "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER. Optional arg REVISION is a revision to annotate from." diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el index aa99e3f4273..0a2e69cefac 100644 --- a/lisp/vc-mcvs.el +++ b/lisp/vc-mcvs.el @@ -463,19 +463,6 @@ The changes are between FIRST-REVISION and SECOND-REVISION." (vc-switches 'MCVS 'diff)))) (if async 1 status))) ; async diff, pessimistic assumption. -(defun vc-mcvs-diff-tree (dir &optional rev1 rev2) - "Diff all files at and below DIR." - (with-current-buffer "*vc-diff*" - ;; Run the command from the root dir so that `mcvs filt' returns - ;; valid relative names. - (setq default-directory (vc-mcvs-root dir)) - ;; cvs diff: use a single call for the entire tree - (let ((coding-system-for-read (or coding-system-for-read 'undecided))) - (apply 'vc-mcvs-command "*vc-diff*" 1 dir "diff" - (and rev1 (concat "-r" rev1)) - (and rev2 (concat "-r" rev2)) - (vc-switches 'MCVS 'diff))))) - (defun vc-mcvs-annotate-command (file buffer &optional revision) "Execute \"mcvs annotate\" on FILE, inserting the contents in BUFFER. Optional arg REVISION is a revision to annotate from." diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el index 0e10738a60d..0b209fdd5af 100644 --- a/lisp/vc-mtn.el +++ b/lisp/vc-mtn.el @@ -168,7 +168,6 @@ (defun vc-mtn-wash-log (file)) -(defalias 'vc-mtn-diff-tree 'vc-mtn-diff) (defun vc-mtn-diff (files &optional rev1 rev2 buffer) (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff" (append (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2))))) diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 43643b931d9..76fdbe5162f 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -437,10 +437,6 @@ The changes are between FIRST-VERSION and SECOND-VERSION." ;; status w.r.t whether the diff was empty or not. (buffer-size (get-buffer buffer))))) -(defun vc-svn-diff-tree (dir &optional rev1 rev2) - "Diff all files at and below DIR." - (vc-svn-diff (list (file-name-as-directory dir)) rev1 rev2)) - ;;; ;;; Snapshot system ;;; |