Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Nowak2015-08-27 06:51:59 -0400
committerMatthias Sohn2015-09-11 19:35:17 -0400
commitc575f5b76fe2937ecaed8dbe45da62eee3a737e1 (patch)
treee7aa2b9dded821f61bea08b344aa5a8b6eba6b12 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parent189356ba819ea2be0e4e4a40d5b54ba541b1e05a (diff)
downloadegit-c575f5b76fe2937ecaed8dbe45da62eee3a737e1.tar.gz
egit-c575f5b76fe2937ecaed8dbe45da62eee3a737e1.tar.xz
egit-c575f5b76fe2937ecaed8dbe45da62eee3a737e1.zip
Add check for warnings and errors before commit
- Add optional check for warnings and errors before commit which can be configured in preferences - Allow to configure if and when a warning should be displayed and if warnings/errors should block the commit - Add a flag to the staging view which allows to override blocking ad-hoc for the next commit Bug: 475559 Change-Id: I352c33d0fed1b610babda2992c6b1b211952dfb2 Signed-off-by: Pawel Nowak <siersciotluk@gmail.com> Signed-off-by: Andrey Loskutov <loskutov@gmx.de> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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.properties11
1 files changed, 11 insertions, 0 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 f11b4fcd9..58f413731 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
@@ -816,6 +816,8 @@ CommitDialog_OpenStagingViewLink=Open <a>Git Staging</a> view
CommitDialog_OpenStagingViewToolTip=For comparing and committing while still being able to navigate and use the editor, try the Git Staging view by clicking the link. The view will be opened with your repository and commit message.
CommitDialog_Path=Path
CommitDialog_Title=Commit Changes to Git Repository
+CommitDialog_IgnoreErrors=Ignore warnings and errors
+CommitDialog_MessageErrors=Fix warnings/errors before you commit changes or explicitly ignore them
CommitDialog_WrongTypeOfCommitMessageProvider=The extension used as CommitMessageProvider has the wrong type (it must implement org.eclipse.egit.ui.ICommitMessageProvider)
SpellcheckableMessageArea_redo=Redo
@@ -1026,6 +1028,13 @@ CommittingPreferencePage_includeUntrackedFiles=Include selected untracked files
CommittingPreferencePage_includeUntrackedFilesTooltip=Check selected untracked files by default
CommittingPreferencePage_signedOffBy=Insert Signed-off-by
CommittingPreferencePage_signedOffByTooltip=Insert "Signed-off-by:" footer by default
+CommittingPreferencePage_CheckBeforeCommitting=Show warning
+CommittingPreferencePage_WarnBeforeCommitting=Warn if there are:
+CommittingPreferencePage_WarnBeforeCommittingTitle=Build problems
+CommittingPreferencePage_WarnBlock_Errors=Errors
+CommittingPreferencePage_WarnBlock_WarningsAndErrors=Warnings and errors
+CommittingPreferencePage_BlockCommit=Block commit button
+CommittingPreferencePage_BlockCommitCombo=Block if there are:
BasicConfigurationDialog_ConfigLocationInfo=These settings will be stored in the Git configuration file in your home directory.
BasicConfigurationDialog_DialogMessage=When creating a commit, Git records name and e-mail of author and committer. Please fill in the information so that your commits are correctly attributed.
@@ -1792,8 +1801,10 @@ StagingView_MergeTool=Merge Tool
StagingView_AddJob=Adding files to index...
StagingView_RemoveJob=Removing files from index...
StagingView_ResetJob=Unstaging files...
+StagingView_MessageErrors=Fix warnings/errors before you commit changes or explicitly ignore them
StagingViewContentProvider_SubmoduleError=Unhandled exception while analyzing submodules
+StagingView_IgnoreErrors=Ignore warnings and errors
StashApplyCommand_applyFailed=Applying stashed commit ''{0}'' failed due to ''{1}''
StashApplyCommand_jobTitle=Apply changes from stashed commit ''{0}''
StashCreateCommand_includeUntrackedLabel=Include untracked files

Back to the top