[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112368: * vc/vc-bzr.el (vc-bzr-print
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112368: * vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1. |
Date: |
Wed, 24 Apr 2013 01:13:52 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112368
fixes bug: http://debbugs.gnu.org/14168
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-04-24 01:13:52 -0700
message:
* vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1.
modified:
lisp/ChangeLog
lisp/vc/vc-bzr.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-04-24 07:59:29 +0000
+++ b/lisp/ChangeLog 2013-04-24 08:13:52 +0000
@@ -1,5 +1,6 @@
2013-04-24 Glenn Morris <address@hidden>
+ * 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)
=== modified file 'lisp/vc/vc-bzr.el'
--- a/lisp/vc/vc-bzr.el 2013-04-24 07:52:00 +0000
+++ b/lisp/vc/vc-bzr.el 2013-04-24 08:13:52 +0000
@@ -712,6 +712,15 @@
(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)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112368: * vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1.,
Glenn Morris <=