Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 334206 - [client] compare view
Summary: [client] compare view
Status: CLOSED FIXED
Alias: None
Product: Orion
Classification: ECD
Component: Client (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: 0.2   Edit
Assignee: libing wang CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 337212 337463 337885
Blocks:
  Show dependency tree
 
Reported: 2011-01-12 23:39 EST by Susan McCourt CLA
Modified: 2011-09-01 11:41 EDT (History)
6 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Susan McCourt CLA 2011-01-12 23:39:10 EST
We need a compare/diff viewer.
For finding differences, there are various solutions.

Look at gerrit - are the diff pieces reusable...or is there a web service to call gerrit
http://code.google.com/p/gerrit/

Bespin and Collabedit both use the google diff library (as does google docs).
We should look into this.

http://code.google.com/p/google-diff-match-patch/

Here's a (BSD license) free js lib for diffing, but it seems inactive.
http://snowtide.com/jsdifflib

Felipe Heidrich Nov 22, 2010 1:15 P.M.
My two cents:

You can use any library you want find the differences, but to display the diffs you should use our web editor.
Comment 1 Szymon Brandys CLA 2011-02-25 08:34:02 EST
Libing, there is org.eclipse.orion.client.git bundle where you could move your compare UI. Moreover you will find JS GitService there, which you can use for getting diffs.
Comment 2 John Arthorne CLA 2011-02-25 09:04:43 EST
(In reply to comment #1)
> Libing, there is org.eclipse.orion.client.git bundle where you could move your
> compare UI. Moreover you will find JS GitService there, which you can use for
> getting diffs.

The compare UI should have no dependency on git - if I am using a different SCM I will still want to view diffs. Or consider the use case of selecting any two files in the navigator and doing "compare with each other". Of course there is a piece that needs to be aware of the Git web service for obtaining diffs.
Comment 3 Szymon Brandys CLA 2011-02-25 10:05:17 EST
(In reply to comment #2)
I see. I thought this is just a Git Diff viewer. Anyway JS Git Service is in the Git Client bundle, so Libing feel free to make changes there.
Comment 4 libing wang CLA 2011-03-09 13:03:56 EST
the feature is there as the side by side compare viewer .You can open this page by going to the git status and open it from a changed file.
From post M6 this viewer will be enhanced as a merge editor .