bug#2872: diff from log-view not working for bzr

bug#2872: diff from log-view not working for bzr

[Dan Nicolaescu]

Do a C-x v l on any file under bzr.

Put the point on some random log entry and type 
d
And empty *vc-diff* window will appear.

The problem is that vc-bzr-diff gets called with the arguments REV1 == REV2.
And that happens because of this code in log-view-diff:

        (log-view-msg-next)
        (setq to (log-view-current-tag))  [1]

Given a log entry like this:

------------------------------------------------------------
revno: 295


`log-view-msg-next' puts the point at the beginning of the ----
line and `log-view-current-tag' returns the version of the _previous_
log entry.  It happens because `log-view-current-tag' first does a 
(forward-line 1) --> point will be at "revno" after that.
And then (re-search-backward log-view-message-re nil t)
which will find the current log entry.

So in conclusion code [1] fails to advance and find the next log
entry.

bug#2872: marked as done (diff from log-view not working for bzr)

[Emacs bug Tracking System]

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


Your message dated Mon, 06 Apr 2009 21:51:19 -0400
with message-id <87k55x8c4o.fsf@cyd.mit.edu>
and subject line Re: diff from log-view not working for bzr
has caused the Emacs bug report #2872,
regarding diff from log-view not working for bzr
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@emacsbugs.donarmstrong.com
immediately.)


-- 
2872: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=2872
Emacs Bug Tracking System
Contact owner@emacsbugs.donarmstrong.com with problems

[-- Attachment #2: Type: message/rfc822, Size: 3366 bytes --]

From: Dan Nicolaescu <dann@ics.uci.edu>
To: bug-gnu-emacs <bug-gnu-emacs@gnu.org>
Subject: diff from log-view not working for bzr
Date: Thu, 2 Apr 2009 19:09:56 -0700 (PDT)
Message-ID: <200904030209.n3329uQj012191@godzilla.ics.uci.edu>


Do a C-x v l on any file under bzr.

Put the point on some random log entry and type 
d
And empty *vc-diff* window will appear.

The problem is that vc-bzr-diff gets called with the arguments REV1 == REV2.
And that happens because of this code in log-view-diff:

        (log-view-msg-next)
        (setq to (log-view-current-tag))  [1]

Given a log entry like this:

------------------------------------------------------------
revno: 295


`log-view-msg-next' puts the point at the beginning of the ----
line and `log-view-current-tag' returns the version of the _previous_
log entry.  It happens because `log-view-current-tag' first does a 
(forward-line 1) --> point will be at "revno" after that.
And then (re-search-backward log-view-message-re nil t)
which will find the current log entry.

So in conclusion code [1] fails to advance and find the next log
entry.






[-- Attachment #3: Type: message/rfc822, Size: 1204 bytes --]

From: Chong Yidong <cyd@stupidchicken.com>
To: Dan Nicolaescu <dann@ics.uci.edu>
Cc: 2872-done@emacsbugs.donarmstrong.com
Subject: Re: diff from log-view not working for bzr
Date: Mon, 06 Apr 2009 21:51:19 -0400
Message-ID: <87k55x8c4o.fsf@cyd.mit.edu>

> Do a C-x v l on any file under bzr.
>
> Put the point on some random log entry and type 
> d
> And empty *vc-diff* window will appear.

I've checked in a fix.

bug#2872: diff from log-view not working for bzr

[Dan Nicolaescu]

Chong Yidong <cyd@stupidchicken.com> writes:

  > > Do a C-x v l on any file under bzr.
  > >
  > > Put the point on some random log entry and type 
  > > d
  > > And empty *vc-diff* window will appear.
  > 
  > I've checked in a fix.

The fix was too radical, log entries for merges don't work anymore.
They have a format like:

    ------------------------------------------------------------
    revno: 123.1.4
    committer: 
    branch nick: blah
    timestamp: blah
    message:
      blah
        ------------------------------------------------------------
        revno: 12.3.123

bug#2872: diff from log-view not working for bzr

[Chong Yidong]

Dan Nicolaescu <dann@ics.uci.edu> writes:

> The fix was too radical, log entries for merges don't work anymore.
>
>     ------------------------------------------------------------
>     revno: 123.1.4
>     committer: 
>     branch nick: blah
>     timestamp: blah
>     message:
>       blah
>         ------------------------------------------------------------
>         revno: 12.3.123

OK.  I tweaked log-view-message-re to allow for spaces before the
"revno" string.