From: Lars Ljung <lars@matholka.se>
To: Glenn Morris <rgm@gnu.org>
Cc: 13547@debbugs.gnu.org
Subject: bug#13547: svn annotate - incorrect previous/next revision
Date: Sun, 27 Jan 2013 12:32:47 +0100 [thread overview]
Message-ID: <5105105F.9040500@matholka.se> (raw)
In-Reply-To: <vgy5ff748s.fsf@fencepost.gnu.org>
2013-01-27 03:24, Glenn Morris skrev:
> Thanks. I guess the drawback here is, that will contact the svn
> repository, which may be on a remote server, so could be slow.
>
> It seems this is used by vc-annotate, vc-rollback, and vc-diff.
Yes, it will be slower. But as far as I know there is no other way to
get the previous/next revision of a file.
I suppose the output from an unlimited "svn log" could be saved to speed
up future operations. vc-annotate-warp-revision might actually call
these functions multiple times.
vc-rollback is not supported by the svn backend.
I don'f fully understand how vc-diff works, but these functions are not
called for "C-x v =". This is good since that operation should not
require server access at all.
vc-annotate-show-diff-revision-at-line calls vc-svn-previous-revision.
In that case the server will be contacted twice for no good reason, a
simple "svn diff -r rev" would suffice (isn't this true for all backends?).
vc-annotate-show-changeset-diff-revision-at-line calls
vc-svn-previous-revision with filename set to nil. It that case it makes
sense to return rev-1. The modified patch below takes care of that.
=== modified file 'lisp/vc/vc-svn.el'
*** lisp/vc/vc-svn.el 2013-01-02 16:13:04 +0000
--- lisp/vc/vc-svn.el 2013-01-27 11:04:07 +0000
***************
*** 259,279 ****
;; works just fine.
(defun vc-svn-previous-revision (file rev)
! (let ((newrev (1- (string-to-number rev))))
! (when (< 0 newrev)
! (number-to-string newrev))))
(defun vc-svn-next-revision (file rev)
! (let ((newrev (1+ (string-to-number rev))))
! ;; The "working revision" is an uneasy conceptual fit under
Subversion;
! ;; we use it as the upper bound until a better idea comes along.
If the
! ;; workfile version W coincides with the tree's latest revision R,
then
! ;; this check prevents a "no such revision: R+1" error. Otherwise, it
! ;; inhibits showing of W+1 through R, which could be considered
anywhere
! ;; from gracious to impolite.
! (unless (< (string-to-number (vc-file-getprop file
'vc-working-revision))
! newrev)
! (number-to-string newrev))))
;;;
--- 259,286 ----
;; works just fine.
(defun vc-svn-previous-revision (file rev)
! (if file
! (with-temp-buffer
! (let (process-file-side-effects)
! (vc-svn-command t 0 file "log" "-q" "--limit" "2"
! (format "-r%s:1" rev)))
! (let ((revision-list '()))
! (while (re-search-backward "^r\\([0-9]+\\)" nil t)
! (push (match-string 1) revision-list))
! (cadr revision-list)))
! (let ((newrev (1- (string-to-number rev))))
! (when (< 0 newrev)
! (number-to-string newrev)))))
(defun vc-svn-next-revision (file rev)
! (with-temp-buffer
! (let (process-file-side-effects)
! (vc-svn-command t 0 file "log" "-q" "--limit" "2"
! (format "-r%s:HEAD" rev)))
! (let ((revision-list '()))
! (while (re-search-backward "^r\\([0-9]+\\)" nil t)
! (push (match-string 1) revision-list))
! (cadr revision-list))))
;;;
next prev parent reply other threads:[~2013-01-27 11:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 9:29 bug#13547: svn annotate - incorrect previous/next revision Lars Ljung
2013-01-27 2:24 ` Glenn Morris
2013-01-27 11:32 ` Lars Ljung [this message]
2021-07-15 9:01 ` Lars Ingebrigtsen
2021-07-30 11:54 ` Lars Ingebrigtsen
2021-07-31 2:40 ` Dmitry Gutov
2022-03-23 19:57 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5105105F.9040500@matholka.se \
--to=lars@matholka.se \
--cc=13547@debbugs.gnu.org \
--cc=rgm@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).