Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
469199e7
Commit
469199e7
authored
Mar 30, 2011
by
Oswald Buddenhagen
Browse files
abort commit if commit message cannot be saved
parent
096a7aa7
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/plugins/bazaar/bazaarplugin.cpp
View file @
469199e7
...
...
@@ -630,7 +630,8 @@ bool BazaarPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submit
QStringList
files
=
commitEditor
->
checkedFiles
();
if
(
!
files
.
empty
())
{
//save the commit message
m_core
->
fileManager
()
->
saveFile
(
editorFile
);
if
(
!
m_core
->
fileManager
()
->
saveFile
(
editorFile
))
return
false
;
//rewrite entries of the form 'file => newfile' to 'newfile' because
//this would mess the commit command
...
...
src/plugins/cvs/cvsplugin.cpp
View file @
469199e7
...
...
@@ -501,8 +501,9 @@ bool CVSPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEdi
bool
closeEditor
=
true
;
if
(
!
fileList
.
empty
())
{
// get message & commit
Core
::
ICore
::
instance
()
->
fileManager
()
->
saveFile
(
fileIFace
);
closeEditor
=
commit
(
m_commitMessageFileName
,
fileList
);
closeEditor
=
Core
::
ICore
::
instance
()
->
fileManager
()
->
saveFile
(
fileIFace
);
if
(
closeEditor
)
closeEditor
=
commit
(
m_commitMessageFileName
,
fileList
);
}
if
(
closeEditor
)
cleanCommitMessageFile
();
...
...
src/plugins/git/gitplugin.cpp
View file @
469199e7
...
...
@@ -781,7 +781,8 @@ bool GitPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *submitEdi
bool
closeEditor
=
true
;
if
(
!
fileList
.
empty
()
||
!
m_commitAmendSHA1
.
isEmpty
())
{
// get message & commit
m_core
->
fileManager
()
->
saveFile
(
fileIFace
);
if
(
!
m_core
->
fileManager
()
->
saveFile
(
fileIFace
))
return
false
;
closeEditor
=
m_gitClient
->
addAndCommit
(
m_submitRepository
,
editor
->
panelData
(),
...
...
src/plugins/mercurial/mercurialplugin.cpp
View file @
469199e7
...
...
@@ -664,7 +664,8 @@ bool MercurialPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *sub
const
QStringList
files
=
commitEditor
->
checkedFiles
();
if
(
!
files
.
empty
())
{
//save the commit message
core
->
fileManager
()
->
saveFile
(
editorFile
);
if
(
!
core
->
fileManager
()
->
saveFile
(
editorFile
))
return
false
;
QHash
<
int
,
QVariant
>
extraOptions
;
extraOptions
[
MercurialClient
::
AuthorCommitOptionId
]
=
commitEditor
->
committerInfo
();
...
...
src/plugins/perforce/perforceplugin.cpp
View file @
469199e7
...
...
@@ -1365,7 +1365,8 @@ bool PerforcePlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *subm
m_settings
.
setPromptToSubmit
(
wantsPrompt
);
m_settings
.
toSettings
(
Core
::
ICore
::
instance
()
->
settings
());
}
Core
::
ICore
::
instance
()
->
fileManager
()
->
saveFile
(
fileIFace
);
if
(
!
Core
::
ICore
::
instance
()
->
fileManager
()
->
saveFile
(
fileIFace
))
return
false
;
if
(
answer
==
VCSBase
::
VCSBaseSubmitEditor
::
SubmitDiscarded
)
{
cleanCommitMessageFile
();
return
true
;
...
...
src/plugins/subversion/subversionplugin.cpp
View file @
469199e7
...
...
@@ -512,8 +512,9 @@ bool SubversionPlugin::submitEditorAboutToClose(VCSBase::VCSBaseSubmitEditor *su
bool
closeEditor
=
true
;
if
(
!
fileList
.
empty
())
{
// get message & commit
Core
::
ICore
::
instance
()
->
fileManager
()
->
saveFile
(
fileIFace
);
closeEditor
=
commit
(
m_commitMessageFileName
,
fileList
);
closeEditor
=
Core
::
ICore
::
instance
()
->
fileManager
()
->
saveFile
(
fileIFace
);
if
(
closeEditor
)
closeEditor
=
commit
(
m_commitMessageFileName
,
fileList
);
}
if
(
closeEditor
)
cleanCommitMessageFile
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment