[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bugs-dist
Subject:    [Bug 146114] Perforce VCS diff not compatible with KomparePart
From:       Paul Fee <pfee () talk21 ! com>
Date:       2007-05-29 14:41:26
Message-ID: 20070529144126.8165.qmail () ktown ! kde ! org
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
         
http://bugs.kde.org/show_bug.cgi?id=146114         




------- Additional Comments From pfee talk21 com  2007-05-29 16:41 -------
Created an attachment (id=20715)
 --> (http://bugs.kde.org/attachment.cgi?id=20715&action=view)
Use perforce unified diff for compatibility with KomparePart

Fixed two warnings in perforcepart.h

Added -du option to p4 diff so that it produces unified diff output.

Added "---" and "+++" as the first two lines of the diff string before passing
this into the diff front end.

The text after the "---" line becomes the title of both the left and right
split view in KomparePart.  This is not ideal, you'd want the VCS repository
path to be shown above the left view and the local disk path to be shown above
the right view.  However I haven't yet determined how to do that.

Also, KomparePart can shorten the path supplied after the "---" header line. 
This may be due to logic which determines the line would have been too long to
display in full.

KomparePart now shows Perforce diffs correctly in visual side by side format.
[prev in list] [next in list] [prev in thread] [next in thread]