From: Glenn Morris Date: Wed, 24 Apr 2013 08:13:52 +0000 (-0700) Subject: * vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~387 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3b8fe7527bba99adb7901bce07b7b124c3ce9726;p=emacs.git * vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1. Fixes: debbugs:14168 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd562cd4eb4..0fb21997226 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,6 @@ 2013-04-24 Glenn Morris + * vc/vc-bzr.el (vc-bzr-print-log): * vc/vc-hg.el (vc-hg-print-log): * vc/vc-svn.el (vc-svn-print-log): Fix START-REVISION with LIMIT != 1. (Bug#14168) diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el index d01fcede4be..06942ad283c 100644 --- a/lisp/vc/vc-bzr.el +++ b/lisp/vc/vc-bzr.el @@ -712,6 +712,15 @@ If LIMIT is non-nil, show no more than this many entries." (when shortlog '("--line")) (when start-revision (list (format "-r..%s" start-revision))) (when limit (list "-l" (format "%s" limit))) + ;; This is to remove --forward, if it has been added by an alias. + ;; There is no sensible way to combine --limit and --forward, + ;; and it breaks the meaning of START-REVISION as the + ;; _newest_ revision. See bug#14168. + ;; FIXME There may be other alias stuff we want to keep. + ;; Is there a way to just suppress --forward? + ;; As of 2013/4 the only caller uses limit = 1, so it does + ;; not matter much. + (and start-revision limit (> limit 1) '("--no-aliases")) (if (stringp vc-bzr-log-switches) (list vc-bzr-log-switches) vc-bzr-log-switches)))))