GNU bug report logs - #2872
diff from log-view not working for bzr

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 2872 in the body.
You can then email your comments to 2872 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #3 received at submit <at> emacsbugs.donarmstrong.com (full text, mbox):

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

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.

Message #10 received at 2872-done <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Chong Yidong <cyd <at> stupidchicken.com>
To: Dan Nicolaescu <dann <at> ics.uci.edu>
Cc: 2872-done <at> debbugs.gnu.org
Subject: Re: diff from log-view not working for bzr
Date: Mon, 06 Apr 2009 21:51:19 -0400

> 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.

Message #13 received at 2872 <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Dan Nicolaescu <dann <at> ics.uci.edu>
To: Chong Yidong <cyd <at> stupidchicken.com>
Cc: 2872 <at> debbugs.gnu.org
Subject: Re: diff from log-view not working for bzr
Date: Mon, 6 Apr 2009 19:29:19 -0700 (PDT)

Chong Yidong <cyd <at> 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

Message #18 received at 2872 <at> emacsbugs.donarmstrong.com (full text, mbox):

From: Chong Yidong <cyd <at> stupidchicken.com>
To: Dan Nicolaescu <dann <at> ics.uci.edu>
Cc: 2872 <at> debbugs.gnu.org
Subject: Re: diff from log-view not working for bzr
Date: Tue, 07 Apr 2009 00:09:48 -0400

Dan Nicolaescu <dann <at> 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.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.