Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 339439

Summary:	Git status and compare editor design direction post M6
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Client	Assignee:	libing wang <libingw>
Status:	CLOSED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	bokowski, john.arthorne, libingw, susan, Szymon.Brandys, tomasz.zarna
Version:	0.2
Target Milestone:	0.2
Hardware:	All
OS:	All
Whiteboard:

Description libing wang

2011-03-09 16:52:54 EST

I am opening this bug for tracking git status and compare editor design discussion after M6.
We still need to open separate bugs to track details on different features/areas but this will be an area for ideas.
Currently  I am thinking about the following new stuff.
1. Add more git related features in status page (not to mention amend , checkout , etc)
2. Use canvas curve instead of gap in the side by side viewer
3. enhance the side by side viewer as merge editor.

Please add your comments .

Comment 1 Boris Bokowski

2011-03-09 17:06:04 EST

Here's a hard one: enable syntax highlighting and regular edit commands in the merge editor.

Comment 2 libing wang

2011-03-10 08:56:21 EST

(In reply to comment #1)
> Here's a hard one: enable syntax highlighting and regular edit commands in the
> merge editor.

Agree. I need to talk to Silenio/Felipe after M6 . Maybe the editor model has to provide additional APIs to achieve this.

Comment 3 Szymon Brandys

2011-03-10 10:18:49 EST

(In reply to comment #0)
> I am opening this bug for tracking git status and compare editor design
> discussion after M6.

I would like to discuss Git UI in general. 

I think we need to add at least two other views for Git. One for Git Repositories (Bug 338226) and another one for Git Log (Bug 334213). Moreover I would like to discuss what kind of Git label/command decoration should be visible in the navigator.

Comment 4 libing wang

2011-03-15 11:17:53 EDT

I've opened https://bugs.eclipse.org/bugs/show_bug.cgi?id=340039 to track the side by side editor design.
I am not quite sure if we should still use the gaped-model for compare editor but I started to think about it.
As an end user I would prefer to using an editor without gap (like we did in desktop) so that I don't get confused by the gap lines when I am editing.

Comment 5 libing wang

2011-03-28 13:01:00 EDT

(In reply to comment #1)
> Here's a hard one: enable syntax highlighting and regular edit commands in the
> merge editor.

Created https://bugs.eclipse.org/bugs/show_bug.cgi?id=341141 for a better solution but now I will work this around.

Comment 6 libing wang

2011-04-25 09:11:44 EDT

All the features in M7 is done :
1.Writable compare editor.
2.graphical comparing match
3.Savable and undoable left side editor.
4.marking conflicting file and show conflict area inside editor(need to improve to 3-way compare in M8.
I am closing this bug.