From 02d983299eb92410a1b0279226cee2bae5d27d20 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 11 Oct 2012 11:07:49 +0200 Subject: [PATCH] Fixed issue #1443: git svn dcommit: unclear behavior for dirty working tree Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 4 ++++ src/Changelog.txt | 1 + src/Resources/TortoiseProcENG.rc | 1 + src/TortoiseProc/AppUtils.cpp | 4 ++-- src/TortoiseProc/Commands/RebaseCommand.cpp | 2 +- src/TortoiseProc/Commands/SVNRebaseCommand.cpp | 2 +- src/TortoiseProc/RebaseDlg.cpp | 2 +- src/TortoiseProc/resource.h | 1 + 8 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index ecf5ab7d2..22942b8ad 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -1055,6 +1055,10 @@ msgstr "" msgid "&Start Group" msgstr "" +#. Resource IDs: (86) +msgid "&Stash" +msgstr "" + #. Resource IDs: (59393) msgid "&Status Bar" msgstr "" diff --git a/src/Changelog.txt b/src/Changelog.txt index 12db84d79..e82408625 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -14,6 +14,7 @@ Released: unreleased * Fixed issue #1439: In Show log, long messages don't have the triple dots appended, when a Tag/Branch lable is visible * Fixed issue #1444: Cannot launch settings dialog from shell context menu when selecting a file * Fixed issue #1265: MSVC crashing unloading TortoiseGit32.dll (faulting module TortoiseGit32.dll_unloaded) + * Fixed issue #1443: git svn dcommit: unclear behavior for dirty working tree = Release 1.7.13.0 = Released: 2012-09-30 diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index 616cd8473..47049ea52 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -3713,6 +3713,7 @@ BEGIN IDS_DESCRIPTION "Description" IDS_PROC_BROWSEREFS_EDITDESCRIPTION "Edit description" IDS_PROC_SYNC_CONFLICTS "Conflicts" + IDS_STASHBUTTON "&Stash" END #endif // Englisch (USA) resources diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 0f6269d86..b6527254f 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -2332,7 +2332,7 @@ BOOL CAppUtils::SVNDCommit() BOOL IsStash = false; if(!g_Git.CheckCleanWorkTree()) { - if(CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES) + if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1) { CString cmd,out; cmd=_T("git.exe stash"); @@ -2606,7 +2606,7 @@ bool CAppUtils::BisectStart(CString lastGood, CString firstBad, bool autoClose) { if (!g_Git.CheckCleanWorkTree()) { - if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, MB_YESNO|MB_ICONINFORMATION) == IDYES) + if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1) { CString cmd, out; cmd = _T("git.exe stash"); diff --git a/src/TortoiseProc/Commands/RebaseCommand.cpp b/src/TortoiseProc/Commands/RebaseCommand.cpp index cde455642..a318390ab 100644 --- a/src/TortoiseProc/Commands/RebaseCommand.cpp +++ b/src/TortoiseProc/Commands/RebaseCommand.cpp @@ -35,7 +35,7 @@ bool RebaseCommand::Execute() if(!g_Git.CheckCleanWorkTree()) { - if(CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES) + if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1) { CString cmd,out; cmd=_T("git.exe stash"); diff --git a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp index dedd0702d..3fb6954b6 100644 --- a/src/TortoiseProc/Commands/SVNRebaseCommand.cpp +++ b/src/TortoiseProc/Commands/SVNRebaseCommand.cpp @@ -33,7 +33,7 @@ bool SVNRebaseCommand::Execute() if(!g_Git.CheckCleanWorkTree()) { - if(CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES) + if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1) { CString cmd,out; cmd=_T("git.exe stash"); diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index 76b5c0624..9a1cafca6 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -738,7 +738,7 @@ int CRebaseDlg::CheckRebaseCondition() if( !g_Git.CheckCleanWorkTree() ) { - if(CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES) + if (CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH, IDS_APPNAME, 1, IDI_QUESTION, IDS_STASHBUTTON, IDS_ABORTBUTTON) == 1) { CString cmd,out; cmd=_T("git.exe stash"); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index 84cc5ca4f..9ad13270c 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -792,6 +792,7 @@ #define IDS_PROC_BROWSEREFS_EDITDESCRIPTION 1369 #define IDS_PROC_SYNC_CONFLICTS 1370 #define IDC_REPOTREE 1371 +#define IDS_STASHBUTTON 1371 #define IDC_REPOLIST 1372 #define IDC_LIST1 1372 #define IDC_BUGTRAQLIST 1372 -- 2.11.4.GIT