diff options
| author | Eric S. Raymond | 2007-12-27 03:17:24 +0000 |
|---|---|---|
| committer | Eric S. Raymond | 2007-12-27 03:17:24 +0000 |
| commit | be01714b8f9818cd288bf69745c5f5e436bdf0bb (patch) | |
| tree | 392becd7de817ef6d57b7ea3ddef8ccf1c1500ee | |
| parent | 13b5602562a80b3c3e601429bbde45a6db90a0a4 (diff) | |
| download | emacs-be01714b8f9818cd288bf69745c5f5e436bdf0bb.tar.gz emacs-be01714b8f9818cd288bf69745c5f5e436bdf0bb.zip | |
*** empty log message ***
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 3 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 9 |
3 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 09b734891e4..67d1e9e37ba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -19,6 +19,9 @@ | |||
| 19 | 19 | ||
| 20 | * vc-svn.el (vc-svn-print-log): svn log doesn't actually accept | 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. | 21 | multiple arguments, so generate logs sequentially when we get them. |
| 22 | * vc-hg.el (vc-hg-print-log): Gives this CVS-like "Working file:" | ||
| 23 | headers so the various log bindings can do the right thing. | ||
| 24 | * vc-cvs.el (vc-cvs-print-log): Fix a misleading comment. | ||
| 22 | 25 | ||
| 23 | 2007-12-26 Andreas Schwab <schwab@suse.de> | 26 | 2007-12-26 Andreas Schwab <schwab@suse.de> |
| 24 | 27 | ||
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 5ffaf8ffa77..337170ab896 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el | |||
| @@ -500,7 +500,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION." | |||
| 500 | ;;; | 500 | ;;; |
| 501 | 501 | ||
| 502 | (defun vc-cvs-print-log (files &optional buffer) | 502 | (defun vc-cvs-print-log (files &optional buffer) |
| 503 | "Get change log associated with FILE." | 503 | "Get change logs associated with FILES." |
| 504 | ;; It's just the catenation of the individual logs. | ||
| 504 | (vc-cvs-command | 505 | (vc-cvs-command |
| 505 | buffer | 506 | buffer |
| 506 | (if (vc-stay-local-p files) 'async 0) | 507 | (if (vc-stay-local-p files) 'async 0) |
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index af2b4f133d2..d04f607dfa1 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el | |||
| @@ -230,9 +230,9 @@ | |||
| 230 | 230 | ||
| 231 | ;;; History functions | 231 | ;;; History functions |
| 232 | 232 | ||
| 233 | (defun vc-hg-print-log(files &optional buffer) | 233 | (defun vc-hg-print-log (files &optional buffer) |
| 234 | "Get change log associated with FILES." | 234 | "Get change log associated with FILES." |
| 235 | ;; `log-view-mode' needs to have the file name in order to function | 235 | ;; `log-view-mode' needs to have the file names in order to function |
| 236 | ;; correctly. "hg log" does not print it, so we insert it here by | 236 | ;; correctly. "hg log" does not print it, so we insert it here by |
| 237 | ;; hand. | 237 | ;; hand. |
| 238 | 238 | ||
| @@ -244,11 +244,12 @@ | |||
| 244 | (let ((inhibit-read-only t)) | 244 | (let ((inhibit-read-only t)) |
| 245 | ;; We need to loop and call "hg log" on each file separately. | 245 | ;; We need to loop and call "hg log" on each file separately. |
| 246 | ;; "hg log" with multiple file arguments mashes all the logs | 246 | ;; "hg log" with multiple file arguments mashes all the logs |
| 247 | ;; together. | 247 | ;; together. Ironically enough, this puts us back near CVS |
| 248 | ;; which can't generate proper fileset logs either. | ||
| 248 | (dolist (file files) | 249 | (dolist (file files) |
| 249 | (with-current-buffer | 250 | (with-current-buffer |
| 250 | buffer | 251 | buffer |
| 251 | (insert "File: " (file-name-nondirectory file) "\n")) | 252 | (insert "Working file: " file "\n")) ;; Like RCS/CVS. |
| 252 | (vc-hg-command buffer 0 file "log")))) | 253 | (vc-hg-command buffer 0 file "log")))) |
| 253 | 254 | ||
| 254 | (defvar log-view-message-re) | 255 | (defvar log-view-message-re) |