Bug 217070 - [Apply Patch] Show matched hunks in Apply Patch wizard
Summary: [Apply Patch] Show matched hunks in Apply Patch wizard
Status: VERIFIED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Compare (show other bugs)
Version: 3.4   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 3.4 M6   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 205761 205762 217073
  Show dependency tree
 
Reported: 2008-01-30 06:18 EST by Tomasz Zarna CLA
Modified: 2008-03-25 10:24 EDT (History)
0 users

See Also:

Attachments
Patch #1 (15.45 KB, patch)
2008-02-01 08:35 EST, Tomasz Zarna CLA 		no flags Details | Diff
mylyn/context/zip (20.05 KB, application/octet-stream)
2008-02-01 08:35 EST, Tomasz Zarna CLA 		no flags Details
Icon for hunks (552 bytes, image/png)
2008-02-01 08:37 EST, Tomasz Zarna CLA 		no flags Details
Patch #2 (19.37 KB, patch)
2008-02-28 11:09 EST, Tomasz Zarna CLA 		no flags Details | Diff
New icons (2.43 KB, application/octet-stream)
2008-02-28 11:13 EST, Tomasz Zarna CLA 		no flags Details
Show Obsolete (2) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Tomasz Zarna CLA 2008-01-30 06:18:34 EST 
Add an option to show matched hunks in Patch Content tree with an ability to compare it with local copy of a file.
Comment 1 Tomasz Zarna CLA 2008-02-01 08:35:32 EST 
Created attachment 88549 [details]
Patch #1

This is a subset of changes from bug 205761, attachment 86686 [details].

In order to see matched hunks a new option has been added - "Show matched hunks". Also the patch that introduces new icon for a hunk. Compare panes are now fed with proper content but the comparison itself still needs some improvment (see bug 217073).
Comment 2 Tomasz Zarna CLA 2008-02-01 08:35:35 EST 
Created attachment 88550 [details]
mylyn/context/zip
Comment 3 Tomasz Zarna CLA 2008-02-01 08:37:13 EST 
Created attachment 88551 [details]
Icon for hunks

To be placed in org.eclipse.compare/icons/full/ovr16
Comment 4 Tomasz Zarna CLA 2008-02-04 09:04:40 EST 
I'll postpone releasing of the patch: it needs some additional testing and an approved and appropriate icon. In other words, I think we should wait with it for M6.
Comment 5 Tomasz Zarna CLA 2008-02-28 11:09:47 EST 
Created attachment 91020 [details]
Patch #2

Updated version of the previous patch (mainly code cleanup). This is also fix for bug 217073 (show diffs between hunk and local copy).
Comment 6 Tomasz Zarna CLA 2008-02-28 11:13:03 EST 
Created attachment 91021 [details]
New icons

Archive contains two icons: hunk object and error overlay (! replaced with red X).
Comment 7 Tomasz Zarna CLA 2008-02-28 11:47:49 EST 
Released to HEAD.
Comment 8 Tomasz Zarna CLA 2008-03-25 10:24:32 EDT 
Verified in I20080304-1113.