From kdevelop-bugs Tue May 29 14:22:34 2007 From: Paul Fee Date: Tue, 29 May 2007 14:22:34 +0000 To: kdevelop-bugs Subject: [Bug 146114] New: Perforce VCS diff not compatible with KomparePart Message-Id: <20070529162234.146114.pfee () talk21 ! com> X-MARC-Message: https://marc.info/?l=kdevelop-bugs&m=118306977912912 ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. http://bugs.kde.org/show_bug.cgi?id=146114 Summary: Perforce VCS diff not compatible with KomparePart Product: kdevelop Version: 3.4.1 Platform: Ubuntu Packages OS/Version: Linux Status: UNCONFIRMED Severity: normal Priority: NOR Component: general AssignedTo: kdevelop-bugs kdevelop org ReportedBy: pfee talk21 com Version: 3.4.1 (using KDE KDE 3.5.6) Installed from: Ubuntu Packages OS: Linux When using Perforce VCS and selecting "Diff against repository", the output is not in unified diff format. The raw diff view is usable, but right clicking and selecting "Show in KomparePart" does not give the expected visual side by side diff view. The KDevDiffFrontend::showDiff() method expects a QString with the unified diff format. However PerforcePart::diff() does not invoke "p4 diff" with the necessary arguments. Also, the output of "p4 diff" must be modified slightly to have headers suitable for input into KomparePart.