qdiff side-by-side is not aligned properly when there is no newline at one side

[Alexander Belchenko]

Sometimes side-by-side diff is not aligned properly because content on one of the side has no trailing newline. This is very easy to see because horizontal line under file name and properties of next file is not on the same level.

Attached screenshot with illustration. I made this on my WinXP when I run in my versioned-properties branch (available as lp:~bialix/qbzr/versioned-properties) following command:

bzr merge -r297 --qpreview ../trunk

See below simple test case with 2 branches.

[Gary van der Merwe (garyvdm)]

Hi Alexander

I was not able to reproduce this on my computer.

Is it maybe possible that you experienced this with older code?

[Alexander Belchenko (bialix)]

Gary van der Merwe пишет:
> Hi Alexander
>
> I was not able to reproduce this on my computer.
>
> Is it maybe possible that you experienced this with older code?

No, it was with trunk revno.297. BTW I'm still running bzr 1.5+,
not latest 1.6b3. PyQt 4.3.1. But IMO it's not related to shown problem.

I suspect it's related to the fact that diff.py had no newline
at the end of file. I'll try to check this assumption.

[Alexander Belchenko (bialix)]

Gary van der Merwe пишет:
> I was not able to reproduce this on my computer.
>
> Is it maybe possible that you experienced this with older code?

Gary, this bug still present on my machine with current 0.9.2 revno.310.
But bug disappear when I try to qpreview merge of the 0.9.2. I suspect
this is because I've added trailing newline at the end of lib/diff.py
recently.
I'll try to create simple test branch.

[Alexander Belchenko (bialix)]

Gary, I managed to reproduce it with simple example (see attached zip with branches 1 and 2). To reproduce you need to run command

bzr merge --qpreview ../2

from branch 1.

I'm convinced we have several bugs related to diffing files that have no trailing new line in one (and only one) side. Moreover, adding newline in next revision is also produce odd diff. Run in 0.9.2 branch command:

bzr qdiff -c305

and examine last line of diff in SBS view.

[Alexander Belchenko (bialix)]

This is screenshot for `bzr merge --qpreview ../2`.

[Alexander Belchenko (bialix)]

Old QBzr 0.9.1 works properly in the same situation. So it's regression in 0.9.2.

[Alexander Belchenko (bialix)]

I have fix for this and about to push it to 0.9.2 branch.

[Alexander Belchenko (bialix)]

fix pushed to 0.9.2.