diff options
| author | Thomas Wolf | 2019-02-18 16:45:08 +0000 |
|---|---|---|
| committer | Michael Keppler | 2019-02-20 06:19:10 +0000 |
| commit | 191fb490388a219de90e08b41bdc178f544f255e (patch) | |
| tree | 37161b1947ad88c25564a0ff9f09cea512f61340 /org.eclipse.egit.ui/plugin.properties | |
| parent | cd22038cf437a719a5676b0cccb393325e201dab (diff) | |
| download | egit-191fb490388a219de90e08b41bdc178f544f255e.tar.gz egit-191fb490388a219de90e08b41bdc178f544f255e.tar.xz egit-191fb490388a219de90e08b41bdc178f544f255e.zip | |
[history] Handle workspace and non-workspace files alike
With compare mode on and the history view filtered to one file, a
double click on a commit opens a compare editor for that file. But
the behavior for files in the Eclipse workspace and files outside
of the Eclipse workspace were different:
* IResource (file in workspace): compare against working tree
* File (file not in Eclipse workspace): compare against HEAD
The context menu also had the same difference.
Judging from the (now removed) TODO in CompareWithWorkingTreeHandler
comparing against HEAD was just a work-around for not being able to
create a compare editor input for plain java.io.Files.
Since LocalNonWorkspaceTypedElement enables us to do exactly that,
use it and also compare non-workspace files against the working tree.
Remove the Compare with HEAD menu command from the history view
context menu completely. Remove the handler, too, and simply always
use "Compare with Working Tree" instead. "Compare with HEAD" is
available anyway by selecting the HEAD commit and another commit,
then choosing "Compare with each other".
Change-Id: Ic04168432cf64928aa73b81d3cf250f096e74b31
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/plugin.properties')
| -rw-r--r-- | org.eclipse.egit.ui/plugin.properties | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties index 55fc1a46c8..0d42a29700 100644 --- a/org.eclipse.egit.ui/plugin.properties +++ b/org.eclipse.egit.ui/plugin.properties @@ -443,8 +443,7 @@ HistoryCheckoutCommand.label2=&Check Out... HistoryCherryPick.label=C&herry-Pick... HistoryCompareVersions.label=Compare with &Each Other HistoryCompareVersionsInTree.label=Compare with Each Other in &Tree -HistoryCompareWithWorkspace.label=Compare with &Workspace -HistoryCompareWithHead.label=Compare with &HEAD +HistoryCompareWithWorkingTree.label=Compare with &Working Tree HistoryCreateBranch.label=Create &Branch... HistoryCreatePatch.label=Create P&atch... HistoryCreateTag.label=Create &Tag... |