diff options
author | Thomas Wolf | 2019-01-17 12:33:10 +0000 |
---|---|---|
committer | Thomas Wolf | 2019-02-17 20:39:47 +0000 |
commit | 7cefca54bea2d312113c8b682fb3d1090e177fe4 (patch) | |
tree | 1899e9ac3a3f448e6e46997ce2fd1070f7ace6e4 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties | |
parent | ad943fc56decaf1822d885fcf0fdf9497bd7a261 (diff) | |
download | egit-7cefca54bea2d312113c8b682fb3d1090e177fe4.tar.gz egit-7cefca54bea2d312113c8b682fb3d1090e177fe4.tar.xz egit-7cefca54bea2d312113c8b682fb3d1090e177fe4.zip |
Make merge viewers react better on outside changes
Use the standard LocalResourceTypedElement from Platform Team for
editable items backed by an IResource instead of our own
ResourceEditableRevision. Likewise, use LocalNonWorkspaceTypedElement
for editable items backed by a non-workspace File. Make the latter
provide a FileStoreEditorInput. Using standard editor inputs as in
normal editors makes the merge editors pick up changes done elsewhere
and vice versa. Unfortunately the class needs to be a subclass of
LocalResourceTypedElement because the framework makes a number of
"instanceof" tests, but we have to override a number of more methods
to ensure that the right SharedDocumentAdapter (and byte buffer if not
connected) is used.
EditableRevision thus is only for "Compare with Index", i.e., editable
index items. LocationEditableRevision and ResourceEditableRevision
are used for conflict resolutions with "Last HEAD (unmerged)" as input.
In this case it's not possible to provide an editor input that would
match normal inputs for IResources or Files: the initial content must
come from the index stage 2, and the behavior if the (pre-merged)
working tree file is edited in parallel in another editor is confusing
anyway.
LocalFileRevision is deleted. It was originally copied from Platform
Team, but it's the wrong abstraction. It is intended for comparisons
with the local history, which are never handled by EGit, but was used in
EGit to represent an IFile in the working tree. But EGit also already
had its own WorkspaceFileRevision and WorkingTreeFileRevision for
representing items in the working tree, so use those instead. Remove
label computation code related to LocalFileRevision.
Bug: 543495
Change-Id: I933b7aa915bc9fed8f16e5bfc7b34957cec84a57
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties')
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index a468522af3..b98720551b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -1371,14 +1371,10 @@ GitCompareEditorInput_EditorTitleSingleResource={0}: Comparing {1} with {2} GitCompareEditorInput_ResourcesInDifferentReposMessagge=Resources belong to different repositories GitCompareFileRevisionEditorInput_CompareInputTitle={0} GitCompareFileRevisionEditorInput_CompareTooltip=Compare {0} {1} and {2} -GitCompareFileRevisionEditorInput_CurrentRevision=Current Revision GitCompareFileRevisionEditorInput_CurrentTitle=Current -GitCompareFileRevisionEditorInput_contentIdentifier=Problem getting content identifier -GitCompareFileRevisionEditorInput_LocalHistoryLabel=Local history: {0} {1} GitCompareFileRevisionEditorInput_LocalLabel=Local: {0} GitCompareFileRevisionEditorInput_IndexLabel=Index: {0} GitCompareFileRevisionEditorInput_IndexEditableLabel=Index: {0} (editable) -GitCompareFileRevisionEditorInput_LocalRevision=Local Revision GitCompareFileRevisionEditorInput_RevisionLabel={0} {1} ({2}) GitCompareFileRevisionEditorInput_LocalVersion={0} (local version) GitCompareFileRevisionEditorInput_StagedVersion={0} (staged version) @@ -1728,8 +1724,6 @@ InteractiveRebaseView_skipItem_text= Skip InteractiveRebaseView_startItem_text= Start InteractiveRebaseView_this_partName= Rebase Interactive -LocalFileRevision_CurrentVersion=*({0}) -LocalFileRevision_currentVersionTag=<current version> LocalNonWorkspaceTypedElement_errorWritingContents=Error writing contents for local non-workspace element. LoginDialog_changeCredentials=Change stored credentials LoginDialog_login=Login |