[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#13547: svn annotate - incorrect previous/next revision
From: |
Lars Ljung |
Subject: |
bug#13547: svn annotate - incorrect previous/next revision |
Date: |
Fri, 25 Jan 2013 10:29:11 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 |
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))))
;;;
- bug#13547: svn annotate - incorrect previous/next revision,
Lars Ljung <=