diff options
| author | Stefan Monnier | 2007-10-20 01:28:35 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-10-20 01:28:35 +0000 |
| commit | 54a2247d6e1c0b6abb8df6808130797f2a5eec50 (patch) | |
| tree | b716549d33c846844216486e3204fccff073308b | |
| parent | 844b90ae5980f87dd25b38e8cc9e46568f3aa727 (diff) | |
| download | emacs-54a2247d6e1c0b6abb8df6808130797f2a5eec50.tar.gz emacs-54a2247d6e1c0b6abb8df6808130797f2a5eec50.zip | |
* 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.
| -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 de9e1011e40..e0d0e5dd07b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,14 @@ | |||
| 1 | 2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * vc-bzr.el (vc-bzr-diff-tree): | ||
| 4 | * vc-git.el (vc-git-diff-tree): | ||
| 5 | * vc-hg.el (vc-hg-diff-tree): | ||
| 6 | * vc-mcvs.el (vc-mcvs-diff-tree): | ||
| 7 | * vc-mtn.el (vc-mtn-diff-tree): | ||
| 8 | * vc-svn.el (vc-svn-diff-tree): Remove. | ||
| 9 | |||
| 10 | 2007-10-20 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 11 | |||
| 3 | * vc-mtn.el (vc-mtn-revision-completion-table): | 12 | * vc-mtn.el (vc-mtn-revision-completion-table): |
| 4 | * vc-cvs.el (vc-cvs-revision-completion-table): | 13 | * vc-cvs.el (vc-cvs-revision-completion-table): |
| 5 | * vc-arch.el (vc-arch-revision-completion-table): | 14 | * 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." | |||
| 391 | (list "-r" (format "%s..%s" rev1 rev2)) | 391 | (list "-r" (format "%s..%s" rev1 rev2)) |
| 392 | (list "-r" rev1)))))) | 392 | (list "-r" rev1)))))) |
| 393 | 393 | ||
| 394 | (defalias 'vc-bzr-diff-tree 'vc-bzr-diff) | ||
| 395 | 394 | ||
| 396 | 395 | ||
| 397 | ;; FIXME: vc-{next,previous}-revision need fixing in vc.el to deal with | 396 | ;; 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 @@ | |||
| 87 | ;; - comment-history (file) ?? | 87 | ;; - comment-history (file) ?? |
| 88 | ;; - update-changelog (files) COULD BE SUPPORTED | 88 | ;; - update-changelog (files) COULD BE SUPPORTED |
| 89 | ;; * diff (file &optional rev1 rev2 buffer) OK | 89 | ;; * diff (file &optional rev1 rev2 buffer) OK |
| 90 | ;; - revision-completion-table (file) NEEDED? | 90 | ;; - revision-completion-table (files) NEEDED? |
| 91 | ;; - diff-tree (dir &optional rev1 rev2) OK | ||
| 92 | ;; - annotate-command (file buf &optional rev) OK | 91 | ;; - annotate-command (file buf &optional rev) OK |
| 93 | ;; - annotate-time () OK | 92 | ;; - annotate-time () OK |
| 94 | ;; - annotate-current-time () NOT NEEDED | 93 | ;; - annotate-current-time () NOT NEEDED |
| @@ -336,9 +335,6 @@ | |||
| 336 | table (lambda () (vc-git-revision-table files)))) | 335 | table (lambda () (vc-git-revision-table files)))) |
| 337 | table)) | 336 | table)) |
| 338 | 337 | ||
| 339 | (defun vc-git-diff-tree (dir &optional rev1 rev2) | ||
| 340 | (vc-git-diff dir rev1 rev2)) | ||
| 341 | |||
| 342 | (defun vc-git-annotate-command (file buf &optional rev) | 338 | (defun vc-git-annotate-command (file buf &optional rev) |
| 343 | ;; FIXME: rev is ignored | 339 | ;; FIXME: rev is ignored |
| 344 | (let ((name (file-relative-name file))) | 340 | (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 @@ | |||
| 76 | ;; - comment-history (file) NOT NEEDED | 76 | ;; - comment-history (file) NOT NEEDED |
| 77 | ;; - update-changelog (files) NOT NEEDED | 77 | ;; - update-changelog (files) NOT NEEDED |
| 78 | ;; * diff (files &optional rev1 rev2 buffer) OK | 78 | ;; * diff (files &optional rev1 rev2 buffer) OK |
| 79 | ;; - revision-completion-table (file) COMMENTED OUT AS A WORKAROUND FOR A BUG | 79 | ;; - revision-completion-table (files) OK? |
| 80 | ;; - diff-tree (dir &optional rev1 rev2) TEST IT | ||
| 81 | ;; - annotate-command (file buf &optional rev) OK | 80 | ;; - annotate-command (file buf &optional rev) OK |
| 82 | ;; - annotate-time () OK | 81 | ;; - annotate-time () OK |
| 83 | ;; - annotate-current-time () ?? NOT NEEDED | 82 | ;; - annotate-current-time () ?? NOT NEEDED |
| @@ -309,9 +308,6 @@ | |||
| 309 | table (lambda () (vc-hg-revision-table files)))) | 308 | table (lambda () (vc-hg-revision-table files)))) |
| 310 | table)) | 309 | table)) |
| 311 | 310 | ||
| 312 | (defun vc-hg-diff-tree (file &optional oldvers newvers buffer) | ||
| 313 | (vc-hg-diff (list file) oldvers newvers buffer)) | ||
| 314 | |||
| 315 | (defun vc-hg-annotate-command (file buffer &optional revision) | 311 | (defun vc-hg-annotate-command (file buffer &optional revision) |
| 316 | "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER. | 312 | "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER. |
| 317 | Optional arg REVISION is a revision to annotate from." | 313 | 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." | |||
| 463 | (vc-switches 'MCVS 'diff)))) | 463 | (vc-switches 'MCVS 'diff)))) |
| 464 | (if async 1 status))) ; async diff, pessimistic assumption. | 464 | (if async 1 status))) ; async diff, pessimistic assumption. |
| 465 | 465 | ||
| 466 | (defun vc-mcvs-diff-tree (dir &optional rev1 rev2) | ||
| 467 | "Diff all files at and below DIR." | ||
| 468 | (with-current-buffer "*vc-diff*" | ||
| 469 | ;; Run the command from the root dir so that `mcvs filt' returns | ||
| 470 | ;; valid relative names. | ||
| 471 | (setq default-directory (vc-mcvs-root dir)) | ||
| 472 | ;; cvs diff: use a single call for the entire tree | ||
| 473 | (let ((coding-system-for-read (or coding-system-for-read 'undecided))) | ||
| 474 | (apply 'vc-mcvs-command "*vc-diff*" 1 dir "diff" | ||
| 475 | (and rev1 (concat "-r" rev1)) | ||
| 476 | (and rev2 (concat "-r" rev2)) | ||
| 477 | (vc-switches 'MCVS 'diff))))) | ||
| 478 | |||
| 479 | (defun vc-mcvs-annotate-command (file buffer &optional revision) | 466 | (defun vc-mcvs-annotate-command (file buffer &optional revision) |
| 480 | "Execute \"mcvs annotate\" on FILE, inserting the contents in BUFFER. | 467 | "Execute \"mcvs annotate\" on FILE, inserting the contents in BUFFER. |
| 481 | Optional arg REVISION is a revision to annotate from." | 468 | 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 @@ | |||
| 168 | 168 | ||
| 169 | (defun vc-mtn-wash-log (file)) | 169 | (defun vc-mtn-wash-log (file)) |
| 170 | 170 | ||
| 171 | (defalias 'vc-mtn-diff-tree 'vc-mtn-diff) | ||
| 172 | (defun vc-mtn-diff (files &optional rev1 rev2 buffer) | 171 | (defun vc-mtn-diff (files &optional rev1 rev2 buffer) |
| 173 | (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff" | 172 | (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff" |
| 174 | (append (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2))))) | 173 | (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." | |||
| 437 | ;; status w.r.t whether the diff was empty or not. | 437 | ;; status w.r.t whether the diff was empty or not. |
| 438 | (buffer-size (get-buffer buffer))))) | 438 | (buffer-size (get-buffer buffer))))) |
| 439 | 439 | ||
| 440 | (defun vc-svn-diff-tree (dir &optional rev1 rev2) | ||
| 441 | "Diff all files at and below DIR." | ||
| 442 | (vc-svn-diff (list (file-name-as-directory dir)) rev1 rev2)) | ||
| 443 | |||
| 444 | ;;; | 440 | ;;; |
| 445 | ;;; Snapshot system | 441 | ;;; Snapshot system |
| 446 | ;;; | 442 | ;;; |