From c575f5b76fe2937ecaed8dbe45da62eee3a737e1 Mon Sep 17 00:00:00 2001 From: Pawel Nowak Date: Thu, 27 Aug 2015 12:51:59 +0200 Subject: 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 Signed-off-by: Andrey Loskutov Signed-off-by: Matthias Sohn --- .../src/org/eclipse/egit/ui/internal/uitext.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties') 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 f11b4fcd96..58f4137318 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 Git Staging 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 -- cgit v1.2.3