qdiff: wrong diff for removed file

Bug #250159 reported by Alexander Belchenko
2
Affects Status Importance Assigned to Milestone
QBzr
Fix Released
High
Gary van der Merwe

Bug Description

qdiff show removed file wrong in both view.
Side-by-side (SBS) view don't show file info/properties and underline horizontal line at all (see attached screenshot).

Unidiff view is also show wrong info for removed:

=== modified file a
--- a 2008-07-19 19:04:35 +0000
+++ a 2008-07-19 19:05:31 +0000
@@ -1,1 +1,1 @@
-bar
+eggs

=== renamed and modified file b
--- None 1970-01-01 00:00:00 +0000
+++ None 1970-01-01 00:00:00 +0000

While bzr diff show correct output:

=== modified file 'a'
--- a 2008-07-19 19:04:35 +0000
+++ a 2008-07-19 19:05:31 +0000
@@ -1,1 +1,1 @@
-bar
+eggs

=== removed file 'b'
--- b 2008-07-19 19:04:35 +0000
+++ b 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-spam

Tags: qdiff

Related branches

Revision history for this message
Alexander Belchenko (bialix) wrote :
description: updated
Changed in qbzr:
importance: Undecided → High
milestone: none → 0.9.2
status: New → Triaged
Revision history for this message
Alexander Belchenko (bialix) wrote :

It will be nice to have unittest at least for unidiff.

Changed in qbzr:
assignee: nobody → bialix
status: Triaged → In Progress
Revision history for this message
Gary van der Merwe (garyvdm) wrote :

With regard to side by side diffs, this was done intentionally. I feel that it gives a good visual indication that the file was not there before, or not there after.

I will be easy to change if you disagree.

Revision history for this message
Alexander Belchenko (bialix) wrote : Re: [Bug 250159] Re: qdiff: wrong diff for removed file

Gary van der Merwe пишет:
> With regard to side by side diffs, this was done intentionally. I feel
> that it gives a good visual indication that the file was not there
> before, or not there after.

Please, looks closer at attached screenshot. I'm agree about idea,
but disagree about implementation: there is no stat info for removed entry,
no underlined horizontal line, no removed content -- only file name.
I talk about *this* as bug, not about showing entry only on left side of SBS.

Changed in qbzr:
assignee: bialix → garyvdm
status: In Progress → Fix Committed
Changed in qbzr:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.