GNU bug report logs - #5302
Diff-mode fails on Bzr diffs

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 5302 in the body.
You can then email your comments to 5302 AT debbugs.gnu.org in the normal way.

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

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> jurta.org>
To: bug-gnu-emacs <at> gnu.org
Subject: Diff-mode fails on Bzr diffs
Date: Mon, 04 Jan 2010 19:29:36 +0200

With the Bzr output in Diff-mode, `C-c C-c' (`diff-goto-source') signals
the following error:

Debugger entered--Lisp error: (error "End of hunk ambiguously marked")
  signal(error ("End of hunk ambiguously marked"))
  error("End of hunk ambiguously marked")
  diff-sanity-check-hunk()
  diff-find-source-location(nil t)
  diff-goto-source(nil 3)
  call-interactively(diff-goto-source nil nil)

Steps to reproduce:

1. emacs -Q

2. In a Bzr controlled dir, run:

   M-! bzr log -p -r-2.. RET

3. Switch to the output buffer, and type:

   M-x diff-mode RET

4. Go to the last hunk of the first revision and type `C-c C-c'.

The problem is that Brz separates revisions with a line of dashes like

------------------------------------------------------------

that Diff-mode doesn't understand.

-- 
Juri Linkov
http://www.jurta.org/emacs/

Message #10 received at 5302-done <at> debbugs.gnu.org (full text, mbox):

From: Dima Kogan <dima <at> secretsauce.net>
To: 9597-done <at> debbugs.gnu.org, 5302-done <at> debbugs.gnu.org
Subject: Fixed
Date: Tue, 31 Jan 2017 00:05:05 -0800

I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d

Message #13 received at 5302 <at> debbugs.gnu.org (full text, mbox):

From: Tino Calancha <tino.calancha <at> gmail.com>
To: Dima Kogan <dima <at> secretsauce.net>
Cc: 5302 <at> debbugs.gnu.org, 9597 <at> debbugs.gnu.org, tino.calancha <at> gmail.com
Subject: Re: bug#5302: Diff-mode fails on Bzr diffs
Date: Tue, 31 Jan 2017 18:02:08 +0900

Dima Kogan <dima <at> secretsauce.net> writes:

>I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d
Hi Dima,
i just pulled the master branch but i cannot find
such 47a1ebb commit.
$ grep diff-separator-re diff-mode.el
returns 1

Apparently the fix is not there.

Message #16 received at 5302 <at> debbugs.gnu.org (full text, mbox):

From: Tino Calancha <tino.calancha <at> gmail.com>
To: Tino Calancha <tino.calancha <at> gmail.com>
Cc: 5302 <at> debbugs.gnu.org, 9597 <at> debbugs.gnu.org, Eli Zaretskii <eliz <at> gnu.org>,
 Dima Kogan <dima <at> secretsauce.net>
Subject: Re: bug#5302: Diff-mode fails on Bzr diffs
Date: Tue, 31 Jan 2017 18:35:34 +0900 (JST)

On Tue, 31 Jan 2017, Tino Calancha wrote:

>
> Dima Kogan <dima <at> secretsauce.net> writes:
>
>> I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d
> Hi Dima,
> i just pulled the master branch but i cannot find
> such 47a1ebb commit.
> $ grep diff-separator-re diff-mode.el
> returns 1
>
> Apparently the fix is not there.
Also your latest commit f3c77d11af65f3b319b1784b4c3cf08c51aa7997
looks wrong: it changes 5 files with >100 lines changed, 
but the commit message is just one word: stash

Message #19 received at 5302 <at> debbugs.gnu.org (full text, mbox):

From: Dima Kogan <dima <at> secretsauce.net>
To: Tino Calancha <tino.calancha <at> gmail.com>
Cc: 5302 <at> debbugs.gnu.org, 9597 <at> debbugs.gnu.org, Eli Zaretskii <eliz <at> gnu.org>
Subject: Re: bug#5302: Diff-mode fails on Bzr diffs
Date: Tue, 31 Jan 2017 08:52:32 -0800

On January 31, 2017 1:35:34 AM PST, Tino Calancha <tino.calancha <at> gmail.com> wrote:
>
>
>On Tue, 31 Jan 2017, Tino Calancha wrote:
>
>>
>> Dima Kogan <dima <at> secretsauce.net> writes:
>>
>>> I pushed the fix and a test in
>47a1ebb8ab67c97904bf3211eb44ce2d7d40949d
>> Hi Dima,
>> i just pulled the master branch but i cannot find
>> such 47a1ebb commit.
>> $ grep diff-separator-re diff-mode.el
>> returns 1
>>
>> Apparently the fix is not there.
>Also your latest commit f3c77d11af65f3b319b1784b4c3cf08c51aa7997
>looks wrong: it changes 5 files with >100 lines changed, 
>but the commit message is just one word: stash

I made a mistake and ended up pushing the wrong few commits. The revert and the correct commits are pushed now. The fix lives in 189df8262e54c4. The test lives in 3506ec2b11.

Message #22 received at 5302 <at> debbugs.gnu.org (full text, mbox):

From: Tino Calancha <tino.calancha <at> gmail.com>
To: Dima Kogan <dima <at> secretsauce.net>
Cc: 5302 <at> debbugs.gnu.org, 9597 <at> debbugs.gnu.org, Eli Zaretskii <eliz <at> gnu.org>
Subject: Re: bug#5302: Diff-mode fails on Bzr diffs
Date: Wed, 1 Feb 2017 01:55:16 +0900

On 02/01/2017 01:52 AM, Dima Kogan wrote:
> On January 31, 2017 1:35:34 AM PST, Tino Calancha <tino.calancha <at> gmail.com> wrote:
>>
>> On Tue, 31 Jan 2017, Tino Calancha wrote:
>>
>>> Dima Kogan <dima <at> secretsauce.net> writes:
>>>
>>>> I pushed the fix and a test in
>> 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d
>>> Hi Dima,
>>> i just pulled the master branch but i cannot find
>>> such 47a1ebb commit.
>>> $ grep diff-separator-re diff-mode.el
>>> returns 1
>>>
>>> Apparently the fix is not there.
>> Also your latest commit f3c77d11af65f3b319b1784b4c3cf08c51aa7997
>> looks wrong: it changes 5 files with >100 lines changed,
>> but the commit message is just one word: stash
> I made a mistake and ended up pushing the wrong few commits. The revert and the correct commits are pushed now. The fix lives in 189df8262e54c4. The test lives in 3506ec2b11.
>
I see your new commits now.  Thank you very much for fixing this bugs.

Previous Next

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