Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kinzler2011-01-20 19:54:40 -0500
committerMatthias Sohn2011-01-20 19:54:40 -0500
commit5246f101fed6fe7541aa1ce8f9fec5b778beb788 (patch)
treec771141754e968b8369730a6a9a29170ea313f1b /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parentcfe1ccfb6853b3be906cae8f63abcbb6ba3405c4 (diff)
downloadegit-5246f101fed6fe7541aa1ce8f9fec5b778beb788.tar.gz
egit-5246f101fed6fe7541aa1ce8f9fec5b778beb788.tar.xz
egit-5246f101fed6fe7541aa1ce8f9fec5b778beb788.zip
Introduce a tree compare
This improves the "Compare with -> Branch or Tag..." action to also work in folders and projects in the workspace as well as enabling "Compare with each other" action in the HistoryView to appear independent of the current input (currently, this is only available if the input of the HistoryView is a file). When the user issues this action, a dialog will appear asking to select a branch or tag; afterwards, the relevant part of the repository will be scanned for changes and the result will be shown in a specific "Git Tree Compare" view which shows two trees with added, deleted, and changed files. The user can then navigate around; by double-clicking on a file, he can open a CompareEditor with the two respective version. Bug: 304776 Bug: 315585 Change-Id: I95e44191e9d8cee5ce96fb84c7d7755b6b291dca Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties10
1 files changed, 10 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 83f37fb5c..4240bd3e9 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -177,6 +177,16 @@ CompareTargetSelectionDialog_CompareButton=&Compare
CompareTargetSelectionDialog_CompareMessage=Select a branch or tag to compare the resource with
CompareTargetSelectionDialog_CompareTitle=Compare "{0}" with a branch or tag
CompareTargetSelectionDialog_WindowTitle=Compare
+CompareTreeView_AddedOnlyTooltip=Show added files only
+CompareTreeView_AnalyzingRepositoryTaskText=Analyzing Repository
+CompareTreeView_CollapseAllTooltip=Collapse All
+CompareTreeView_ComparingTwoVersionDescription=Comparing version {0} of {1} with {2}
+CompareTreeView_ComparingWorkspaceVersionDescription=Comparing Workspace version of {0} with {1}
+CompareTreeView_DeletedOnlyTooltip=Show deleted files only
+CompareTreeView_EqualFilesTooltip=Show files with equal content
+CompareTreeView_ItemNotFoundInVersionMessage={0} not found in {1}
+CompareTreeView_NoInputText=No input
+CompareTreeView_WorkspaceVersionText=Workspace
CompareWithIndexAction_FileNotInIndex={0} not in index
RebaseCurrentRefCommand_RebaseCanceledMessage=The Rebase operation was canceled

Back to the top