Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kinzler2010-07-05 07:22:07 -0400
committerMathias Kinzler2010-07-05 12:08:31 -0400
commit48a952895da01179c74330b19a752d8fbecf2cf4 (patch)
tree8df3995baaf6c72d334168becaf6d90a0499d916 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parentabde5ac8498f0df4be6762f156a970ef8095d0b5 (diff)
downloadegit-48a952895da01179c74330b19a752d8fbecf2cf4.tar.gz
egit-48a952895da01179c74330b19a752d8fbecf2cf4.tar.xz
egit-48a952895da01179c74330b19a752d8fbecf2cf4.zip
Add repository state to Git Project Label Decorations
With the advent of merge capabilities, we should make the repository state (mostly merge, rebase) visible in the Git label decorationsfor projects. Instead of adding another tag, we re-use the "repository name" tag and append the repository state separated by a pipe similar to the behavior in msysgit. This allows to elegantly treat the "SAFE" state that we don't want to show explicitly: we just add nothing to the repository name. This avoids ugly formatting issues which we would run into if using a separate tag: unless we would want to always show the state (even if it is SAFE) we would introduce ugly spaces into the label decoration in case the state is SAFE (and thus the displayed value is null or an empty String). The alternative of howing the state always does not appear to be the right thing, either, as it would pollute the label decoration with un-needed information in the 99 percent case. Change-Id: Ia20a9b60238077acf9e85c22c7a7958cbb50bfd9 Signed-off-by: Mathias Kinzler <mathias.kinzler@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, 5 insertions, 5 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 bba626b76..0e5f79752 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
@@ -73,7 +73,7 @@ GitCloneWizard_title=Clone Git Repository
GitCloneWizard_jobName=Cloning from {0}
GitCloneWizard_failed=Git repository clone failed.
GitCloneWizard_errorCannotCreate=Cannot create directory {0}.
-GitDecoratorPreferencePage_bindingRepositoryNameFlag=name of the repository
+GitDecoratorPreferencePage_bindingRepositoryNameFlag=Name and state of the Repository (the default state will not be shown)
GitDocument_errorLoadCommit=Could not load commit {0} for {1} corresponding to {2} in {3}
GitDocument_errorLoadTree=Could not load tree {0} for {1} corresponding to {2} in {3}
GitDocument_errorRefreshQuickdiff=Failed to refresh quickdiff
@@ -562,10 +562,10 @@ DecoratorPreferencesPage_folderFormatLabel=F&olders:
DecoratorPreferencesPage_projectFormatLabel=&Projects:
DecoratorPreferencesPage_labelDecorationsLink=See <a>''{0}''</a> to enable or disable Git decorations.
DecoratorPreferencesPage_generalTabFolder=&General
-DecoratorPreferencesPage_bindingResourceName=name of the resource being decorated
-DecoratorPreferencesPage_bindingBranchName=current branch of the project
-DecoratorPreferencesPage_bindingDirtyFlag=flag indicating whether or not the resource is dirty
-DecoratorPreferencesPage_bindingStagedFlag=flag indicating whether or not the resource is staged
+DecoratorPreferencesPage_bindingResourceName=Name of the resource being decorated
+DecoratorPreferencesPage_bindingBranchName=Current branch of the Repository
+DecoratorPreferencesPage_bindingDirtyFlag=Flag indicating whether or not the resource is dirty
+DecoratorPreferencesPage_bindingStagedFlag=Flag indicating whether or not the resource is staged
DecoratorPreferencesPage_selectVariablesToAdd=Select the &variables to add to the decoration format:
DecoratorPreferencesPage_textLabel=T&ext Decorations
DecoratorPreferencesPage_iconLabel=&Icon Decorations

Back to the top