diff options
| author | Glenn Morris | 2013-04-24 00:59:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2013-04-24 00:59:29 -0700 |
| commit | 90b4237a6b2eda8d8af659e6b9928ecf6ac166d8 (patch) | |
| tree | 78b9b3fc4ea8df983996d3b940ec1f7e776133cf | |
| parent | bb7cdf58f6ad1ddbf2dad90568440d756fa831f1 (diff) | |
| download | emacs-90b4237a6b2eda8d8af659e6b9928ecf6ac166d8.tar.gz emacs-90b4237a6b2eda8d8af659e6b9928ecf6ac166d8.zip | |
vc-hg, vc-svn print-log fixes for start-revision with limit != 1
* vc/vc-hg.el (vc-hg-print-log):
* vc/vc-svn.el (vc-svn-print-log): Fix START-REVISION with LIMIT != 1.
Fixes: debbugs:14168
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-hg.el | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index adec7e10e88..dd562cd4eb4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-04-24 Glenn Morris <rgm@gnu.org> | 1 | 2013-04-24 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * vc/vc-hg.el (vc-hg-print-log): | ||
| 4 | * vc/vc-svn.el (vc-svn-print-log): | ||
| 5 | Fix START-REVISION with LIMIT != 1. (Bug#14168) | ||
| 6 | |||
| 3 | * vc/vc-bzr.el (vc-bzr-print-log): | 7 | * vc/vc-bzr.el (vc-bzr-print-log): |
| 4 | * vc/vc-cvs.el (vc-cvs-print-log): | 8 | * vc/vc-cvs.el (vc-cvs-print-log): |
| 5 | * vc/vc-git.el (vc-git-print-log): | 9 | * vc/vc-git.el (vc-git-print-log): |
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 4584036f03b..feec015e52a 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el | |||
| @@ -260,7 +260,7 @@ If LIMIT is non-nil, show no more than this many entries." | |||
| 260 | buffer | 260 | buffer |
| 261 | (apply 'vc-hg-command buffer 0 files "log" | 261 | (apply 'vc-hg-command buffer 0 files "log" |
| 262 | (nconc | 262 | (nconc |
| 263 | (when start-revision (list (format "-r%s:" start-revision))) | 263 | (when start-revision (list (format "-r%s:0" start-revision))) |
| 264 | (when limit (list "-l" (format "%s" limit))) | 264 | (when limit (list "-l" (format "%s" limit))) |
| 265 | (when shortlog (list "--template" (car vc-hg-root-log-format))) | 265 | (when shortlog (list "--template" (car vc-hg-root-log-format))) |
| 266 | vc-hg-log-switches))))) | 266 | vc-hg-log-switches))))) |
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 3009d174e0b..a94bf0d6117 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el | |||
| @@ -515,7 +515,7 @@ If LIMIT is non-nil, show no more than this many entries." | |||
| 515 | (append | 515 | (append |
| 516 | (list | 516 | (list |
| 517 | (if start-revision | 517 | (if start-revision |
| 518 | (format "-r%s" start-revision) | 518 | (format "-r%s:1" start-revision) |
| 519 | ;; By default Subversion only shows the log up to the | 519 | ;; By default Subversion only shows the log up to the |
| 520 | ;; working revision, whereas we also want the log of the | 520 | ;; working revision, whereas we also want the log of the |
| 521 | ;; subsequent commits. At least that's what the | 521 | ;; subsequent commits. At least that's what the |