bug#5302: Diff-mode fails on Bzr diffs

bug#5302: Diff-mode fails on Bzr diffs

[Juri Linkov]

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/

bug#5302: Fixed

[Dima Kogan]

I pushed the fix and a test in 47a1ebb8ab67c97904bf3211eb44ce2d7d40949d

bug#5302: Diff-mode fails on Bzr diffs

[Tino Calancha]

Dima Kogan <dima@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.

bug#9597: bug#5302: Diff-mode fails on Bzr diffs

[Tino Calancha]

On Tue, 31 Jan 2017, Tino Calancha wrote:

>
> Dima Kogan <dima@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

bug#5302: Diff-mode fails on Bzr diffs

[Dima Kogan]

On January 31, 2017 1:35:34 AM PST, Tino Calancha <tino.calancha@gmail.com> wrote:
>
>
>On Tue, 31 Jan 2017, Tino Calancha wrote:
>
>>
>> Dima Kogan <dima@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.

bug#9597: bug#5302: Diff-mode fails on Bzr diffs

[Tino Calancha]

On 02/01/2017 01:52 AM, Dima Kogan wrote:
> On January 31, 2017 1:35:34 AM PST, Tino Calancha <tino.calancha@gmail.com> wrote:
>>
>> On Tue, 31 Jan 2017, Tino Calancha wrote:
>>
>>> Dima Kogan <dima@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.