(vc-annotate-revision-previous-to-line) rcs, cannot go back

(vc-annotate-revision-previous-to-line) rcs, cannot go back

[Uwe Brauer]

Hello

I use this function a lot, but I also checkin jumping branches

1.1 1.2 1.3 1.4
2.1 2.2

But then (vc-annotate-revision-previous-to-line) can go back from 2.2 to
2.1 but not to 1.4.
Msg ist:
Cannot decrement 1 versions from version 3.1

Anybody knows about a hack to achieve jumping from 2.1 to 1.4.

thanks

Uwe Brauer 

Re: (vc-annotate-revision-previous-to-line) rcs, cannot go back

[Thien-Thi Nguyen]

[-- Attachment #1.1: Type: text/plain, Size: 206 bytes --]

() Uwe Brauer <oub@mat.ucm.es>
() Fri, 19 Apr 2013 12:28:15 +0200

   1.1 1.2 1.3 1.4
   2.1 2.2

   [...]

   Anybody knows about a hack to achieve jumping from 2.1 to 1.4.

Here's a quick and dirty hack:

[-- Attachment #1.2: vc-rcs-previous-revision.el --]
[-- Type: application/emacs-lisp, Size: 1232 bytes --]

[-- Attachment #1.3: Type: text/plain, Size: 14 bytes --]


Tested with:

[-- Attachment #1.4: mkfoo --]
[-- Type: application/shell-script, Size: 280 bytes --]

[-- Attachment #1.5: Type: text/plain, Size: 422 bytes --]


and:  C-x C-f /tmp/foo RET
      M->
      C-x v g
      p
      p
      p
      p
      p
      p

It's dirty because it calls rlog(1) directly, sidestepping the VC
abstractions, and what's worse, that info was already laboriously
computed in the process of preparing the annotation buffer, then
discarded (the infelicity is not limited to this function).  :-/

-- 
Thien-Thi Nguyen
GPG key: 4C807502

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: (vc-annotate-revision-previous-to-line) rcs, cannot go back

[Uwe Brauer]

[-- Attachment #1: Type: text/plain, Size: 534 bytes --]


>> "Thien-Thi" == Thien-Thi Nguyen <ttn@gnuvola.org> writes:



   > It's dirty because it calls rlog(1) directly, sidestepping the VC
   > abstractions, and what's worse, that info was already laboriously
   > computed in the process of preparing the annotation buffer, then
   > discarded (the infelicity is not limited to this function).  :-/

Cool, thanks a lot.

however it does not work in GNU emacs 23, since it does not know
the functions, vc-rcs-minor-part, vc-rcs-trunk-p
I presume I have to try 24?

Uwe 

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5556 bytes --]

Re: (vc-annotate-revision-previous-to-line) rcs, cannot go back

[Thien-Thi Nguyen]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

() Uwe Brauer <oub@mat.ucm.es>
() Sat, 20 Apr 2013 12:08:43 +0200

   however it does not work in GNU emacs 23, since it does not know
   the functions, vc-rcs-minor-part, vc-rcs-trunk-p
   I presume I have to try 24?

Those funcs are available as of Emacs 23.2, i believe.  In Emacs 23.1,
they were named ‘vc-minor-part’ and ‘vc-trunk-p’, respectively.  If you
cannot upgrade, you can obtain temporary relief with:

(defalias 'vc-rcs-minor-part 'vc-minor-part)
(defalias 'vc-rcs-trunk-p 'vc-trunk-p)

But it's probably better to get out alive while you can...

-- 
Thien-Thi Nguyen
GPG key: 4C807502

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: (vc-annotate-revision-previous-to-line) rcs, cannot go back

[Uwe Brauer]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]


On 04/20/2013 01:22 PM, Thien-Thi Nguyen wrote:
> (defalias 'vc-rcs-minor-part 'vc-minor-part)
> (defalias 'vc-rcs-trunk-p 'vc-trunk-p)
thanks, but it still does not work in 23.1, so first thing on Monday, 
download 24


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 3738 bytes --]

Re: (vc-annotate-revision-previous-to-line) rcs, cannot go back

[Uwe Brauer]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

>> "Thien-Thi" == Thien-Thi Nguyen <ttn@gnuvola.org> writes:


   > (defalias 'vc-rcs-minor-part 'vc-minor-part)
   > (defalias 'vc-rcs-trunk-p 'vc-trunk-p)

   > But it's probably better to get out alive while you can...


Ok, I confirm it works with 24 and 23.1!
Thanks very much, I will now try to port it to Xemacs, but it looks
difficult. :'(

Uwe 

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5556 bytes --]

Re: (vc-annotate-revision-previous-to-line) rcs, cannot go back

[Thien-Thi Nguyen]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

() Uwe Brauer <oub@mat.ucm.es>
() Tue, 23 Apr 2013 22:32:45 +0200

   Ok, I confirm it works with 24 and 23.1!

Cool.

   I will now try to port it to Xemacs, but it looks difficult. :'(

Take heart.  Please feel free to ask specific questions on
help-gnu-emacs (w/ question-specific subject line).

-- 
Thien-Thi Nguyen
GPG key: 4C807502

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

vc-annotate-show-diff- (was: (vc-annotate-revision-previous-to-line) rcs, cannot go back)

[Uwe Brauer]

[-- Attachment #1: Type: text/plain, Size: 1122 bytes --]

>> "Thien-Thi" == Thien-Thi Nguyen <ttn@gnuvola.org> writes:
Hello


   > () Tue, 23 Apr 2013 22:32:45 +0200

   >    Ok, I confirm it works with 24 and 23.1!

   > Cool.

   >    I will now try to port it to Xemacs, but it looks difficult. :'(

   > Take heart.  Please feel free to ask specific questions on
   > help-gnu-emacs (w/ question-specific subject line).

So  finally the port was trivial. :-D

There is, however, a related issue, namely the function 
`vc-annotate-show-diff-revision-at-line'
which also fails in the setting I described. 

Could your "hack" be used for getting
vc-annotate-show-diff-revision-at-line work also for comparing  say version
6.1 with 5.3 (supposed 5.3 is the last in the 5 branch).


Thanks in advance

Uwe Brauer 

PS BTW, something in your mail setting makes it difficult to read your
message in Xemacs 21.5.32 using "Ma Gnus v0.6"
I receive errors of the sort void-function image-create or
string-match-p. But it is only yours message, but you use gnus and emacs
24 and nothing really fancy as far as I can tell, but maybe I just can't
tell.

[-- Attachment #2: smime.p7s --]
[-- Type: application/pkcs7-signature, Size: 5556 bytes --]