From: Lars Ljung <lars@matholka.se>
To: 13547@debbugs.gnu.org
Subject: bug#13547: svn annotate - incorrect previous/next revision
Date: Fri, 25 Jan 2013 10:29:11 +0100 [thread overview]
Message-ID: <51025067.7070204@matholka.se> (raw)
Hi,
The functions vc-svn-previous-revision and vc-svn-next-revision just add
or subtract 1 from the revision number. The is usually not correct.
This patch uses "svn log" to get the correct previous/next revision of
the file.
Kind regards,
Lars Ljung
=== 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-25 08:26:53 +0000
*************** RESULT is a list of conses (FILE . STATE
*** 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,280 ----
;; works just fine.
(defun vc-svn-previous-revision (file rev)
! (with-temp-buffer
! (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)
! (setq revision-list (cons (match-string 1) revision-list)))
! (cadr revision-list))))
(defun vc-svn-next-revision (file rev)
! (with-temp-buffer
! (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)
! (setq revision-list (cons (match-string 1) revision-list)))
! (cadr revision-list))))
;;;
next reply other threads:[~2013-01-25 9:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 9:29 Lars Ljung [this message]
2013-01-27 2:24 ` bug#13547: svn annotate - incorrect previous/next revision Glenn Morris
2013-01-27 11:32 ` Lars Ljung
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51025067.7070204@matholka.se \
--to=lars@matholka.se \
--cc=13547@debbugs.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.