diff options
| author | Eric S. Raymond | 2007-12-27 03:10:52 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 2007-12-27 03:10:52 +0000 |
| commit | 13b5602562a80b3c3e601429bbde45a6db90a0a4 (patch) | |
| tree | 097f3634482bbccc6d6994d951e6a225e83ded0b | |
| parent | c43b7df62c0cdc2d3a989d38cb33624b183dd612 (diff) | |
| download | emacs-13b5602562a80b3c3e601429bbde45a6db90a0a4.tar.gz emacs-13b5602562a80b3c3e601429bbde45a6db90a0a4.zip | |
*** empty log message ***
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-svn.el | 35 |
2 files changed, 19 insertions, 19 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7dd8e03a299..09b734891e4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -17,6 +17,9 @@ | |||
| 17 | * vc-mcvs.el (vc-mcvs-dir-state): | 17 | * vc-mcvs.el (vc-mcvs-dir-state): |
| 18 | * vc-svn.el (vc-svn-dir-state): Recurse in subdirectories. | 18 | * vc-svn.el (vc-svn-dir-state): Recurse in subdirectories. |
| 19 | 19 | ||
| 20 | * vc-svn.el (vc-svn-print-log): svn log doesn't actually accept | ||
| 21 | multiple arguments, so generate logs sequentially when we get them. | ||
| 22 | |||
| 20 | 2007-12-26 Andreas Schwab <schwab@suse.de> | 23 | 2007-12-26 Andreas Schwab <schwab@suse.de> |
| 21 | 24 | ||
| 22 | * font-lock.el (save-buffer-state): Make sure the state of the | 25 | * font-lock.el (save-buffer-state): Make sure the state of the |
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 2b46d2b9fec..87e1517e879 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el | |||
| @@ -374,25 +374,22 @@ The changes are between FIRST-VERSION and SECOND-VERSION." | |||
| 374 | (vc-setup-buffer buffer) | 374 | (vc-setup-buffer buffer) |
| 375 | (let ((inhibit-read-only t)) | 375 | (let ((inhibit-read-only t)) |
| 376 | (goto-char (point-min)) | 376 | (goto-char (point-min)) |
| 377 | ;; Add a line to tell log-view-mode what file this is. | 377 | (if files |
| 378 | ;; FIXME if there are multiple files, log-view-current-file | 378 | (dolist (file files) |
| 379 | ;; breaks. It's trivial to adapt log-view-file-re for the | 379 | (insert "Working file: " file "\n") |
| 380 | ;; changed prefix, but less trivial to make | 380 | (vc-svn-command |
| 381 | ;; log-view-current-file actually do the right thing in the | 381 | buffer |
| 382 | ;; multiple file case. | 382 | 'async |
| 383 | (insert (format "Working file%s: " | 383 | ;; (if (and (= (length files) 1) (vc-stay-local-p file)) 'async 0) |
| 384 | (if (= (length files) 1) | 384 | (list file) |
| 385 | "" | 385 | "log" |
| 386 | "s")) | 386 | ;; By default Subversion only shows the log up to the |
| 387 | (vc-delistify (mapcar 'file-relative-name files)) "\n")) | 387 | ;; working revision, whereas we also want the log of the |
| 388 | (vc-svn-command | 388 | ;; subsequent commits. At least that's what the |
| 389 | buffer | 389 | ;; vc-cvs.el code does. |
| 390 | (if (and (= (length files) 1) (vc-stay-local-p (car files))) 'async 0) | 390 | "-rHEAD:0")) |
| 391 | files "log" | 391 | ;; Dump log for the entire directory. |
| 392 | ;; By default Subversion only shows the log upto the working revision, | 392 | (vc-svn-command buffer 0 nil "log" "-rHEAD:0"))))) |
| 393 | ;; whereas we also want the log of the subsequent commits. At least | ||
| 394 | ;; that's what the vc-cvs.el code does. | ||
| 395 | "-rHEAD:0"))) | ||
| 396 | 393 | ||
| 397 | (defun vc-svn-wash-log () | 394 | (defun vc-svn-wash-log () |
| 398 | "Remove all non-comment information from log output." | 395 | "Remove all non-comment information from log output." |