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

Bug 322492

Summary:	Compare editor from synchronize view should show commit id
Product:	[Technology] EGit	Reporter:	Stefan Lay <stefan.lay>
Component:	UI	Assignee:	Stefan Lay <stefan.lay>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	dariusz.luksza, remy.suen
Version:	unspecified
Target Milestone:	0.10.0-M1
Hardware:	PC
OS:	All
Whiteboard:

Description Stefan Lay

2010-08-12 05:28:27 EDT

When you double click a file in the workspace model part of the synchronize a compare editor opens. The label contains the sha1 of the blob. This is not relevant for a user. Please show the filename, the abbreviated commit id and the author like in the other compare views of EGit.

Comment 1 Dariusz Luksza

2010-08-20 20:32:23 EDT

It looks like this commit fcf77bcd77dd52d829f67c954b860cca0c71bb2f should fix this.

Comment 2 Stefan Lay

2010-08-23 09:47:18 EDT

 (In reply to comment #1)
> It looks like this commit fcf77bcd77dd52d829f67c954b860cca0c71bb2f should fix
> this.
No, this commit only fixes the labels for the compare editor used for contents of change sets, not for that started from the workspace model.

Comment 3 Remy Suen

2010-08-31 12:33:11 EDT

Here is the code path illustrating the inconsistency.
	ResourceCompareInputChangeNotifier$CompareInputLabelProvider.getRightLabel(Object) line: 113	
	CompareConfiguration$DefaultLabelProvider.getRightLabel(Object) line: 175	
	CompareConfiguration.getRightLabel(Object) line: 573	
	MergeViewerContentProvider.getRightLabel(Object) line: 150	
	PropertiesFileMergeViewer(ContentMergeViewer).updateHeader() line: 1071	
	PropertiesFileMergeViewer(TextMergeViewer).updateHeader() line: 3540	
	PropertiesFileMergeViewer(ContentMergeViewer).internalRefresh(Object) line: 744	
	PropertiesFileMergeViewer(ContentMergeViewer).inputChanged(Object, Object) line: 642	
	PropertiesFileMergeViewer(ContentViewer).setInput(Object) line: 274	
	CompareContentViewerSwitchingPane(CompareViewerSwitchingPane).setInput(Object) line: 277	
	CompareContentViewerSwitchingPane.setInput(Object) line: 158	
	ModelCompareEditorInput(CompareEditorInput).internalSetContentPaneInput(Object) line: 845	
	CompareEditorInput.access$8(CompareEditorInput, Object) line: 843	
	CompareEditorInput$11.run() line: 779	
	BusyIndicator.showWhile(Display, Runnable) line: 70	
	ModelCompareEditorInput(CompareEditorInput).feed1(ISelection) line: 773	
	ModelCompareEditorInput(CompareEditorInput).feedInput() line: 751	
	ModelCompareEditorInput(CompareEditorInput).createContents(Composite) line: 555	
	CompareEditor.createCompareControl() line: 456	
	CompareEditor.access$6(CompareEditor) line: 422	
	CompareEditor$3.run() line: 378

Comment 4 Stefan Lay

2010-09-30 09:33:55 EDT

Patch proposed: http://egit.eclipse.org/r/#change,1683

Comment 5 Stefan Lay

2010-10-08 07:06:06 EDT

Fixed with 56d406bad8d1c91

Comment 6 Stefan Lay

2010-10-08 07:06:33 EDT