From e00659bb64466951cdf9d663503c33f46f65bf49 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Mon, 26 Sep 2011 21:15:10 +0200 Subject: [PATCH] Fixed issue #673: Applying a patch does not honour CRLF in files added keep-cr option Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/Resources/TortoiseProcENG.rc | 1 + src/TortoiseProc/ImportPatchDlg.cpp | 5 +++++ src/TortoiseProc/ImportPatchDlg.h | 1 + src/TortoiseProc/resource.h | 1 + 5 files changed, 9 insertions(+) diff --git a/src/Changelog.txt b/src/Changelog.txt index c025815a0..4e22645be 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -18,6 +18,7 @@ * Fixed issue #829: "Remote" combobox in "Push" window updates only after losing focus * Fixed issue #906: Add ability to add files with options -force. * Fixed issue #914: unifiled diff always show wrong changes (base files compare with new files) + * Fixed issue #673: Applying a patch does not honour CRLF in files = Release 1.7.3.0 = == Features == diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index cf2c1d49f..3ac1671b2 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -1780,6 +1780,7 @@ BEGIN CONTROL "3 way merge",IDC_CHECK_3WAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,108,57,10 CONTROL "ignore space change",IDC_CHECK_IGNORE_SPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,73,108,82,10 CONTROL "Add ""Signed-off-by""",IDC_SIGN_OFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,166,108,80,10 + CONTROL "Keep CR",IDC_KEEP_CR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,108,43,10 CONTROL "",IDC_AM_SPLIT,"Static",SS_OWNERDRAW,7,121,362,6,WS_EX_TRANSPARENT PUSHBUTTON "Dumy Group For locat TabCtr",IDC_AM_DUMY_TAB,7,130,362,109,NOT WS_VISIBLE DEFPUSHBUTTON "Apply",IDOK,202,244,50,14 diff --git a/src/TortoiseProc/ImportPatchDlg.cpp b/src/TortoiseProc/ImportPatchDlg.cpp index 865de618f..93e1c7fe3 100644 --- a/src/TortoiseProc/ImportPatchDlg.cpp +++ b/src/TortoiseProc/ImportPatchDlg.cpp @@ -43,6 +43,7 @@ CImportPatchDlg::CImportPatchDlg(CWnd* pParent /*=NULL*/) m_b3Way = 1; m_bIgnoreSpace = 1; m_bAddSignedOffBy = FALSE; + m_bKeepCR = TRUE; } CImportPatchDlg::~CImportPatchDlg() @@ -58,6 +59,7 @@ void CImportPatchDlg::DoDataExchange(CDataExchange* pDX) DDX_Check(pDX, IDC_CHECK_3WAY, m_b3Way); DDX_Check(pDX, IDC_CHECK_IGNORE_SPACE, m_bIgnoreSpace); DDX_Check(pDX, IDC_SIGN_OFF, m_bAddSignedOffBy); + DDX_Check(pDX, IDC_KEEP_CR, m_bKeepCR); } void CImportPatchDlg::AddAmAnchor() @@ -387,6 +389,9 @@ UINT CImportPatchDlg::PatchThread() if(this->m_bIgnoreSpace) cmd+=_T("--ignore-space-change "); + if(this->m_bKeepCR) + cmd+=_T("--keep-cr "); + cmd +=_T("\""); cmd += m_cList.GetItemText(i,0); cmd +=_T("\""); diff --git a/src/TortoiseProc/ImportPatchDlg.h b/src/TortoiseProc/ImportPatchDlg.h index 9460ab5e3..e2be4f85a 100644 --- a/src/TortoiseProc/ImportPatchDlg.h +++ b/src/TortoiseProc/ImportPatchDlg.h @@ -100,6 +100,7 @@ protected: BOOL m_b3Way; BOOL m_bIgnoreSpace; BOOL m_bAddSignedOffBy; + BOOL m_bKeepCR; BOOL IsFinish() { diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index fa6b8b12f..0523e6f0c 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -925,6 +925,7 @@ #define IDC_BUTTON_BROWSE_SOURCE_BRANCH 1483 #define IDC_BUTTON_BROWSE_REF 1483 #define IDC_BUTTON_MANAGE 1483 +#define IDC_KEEP_CR 1483 #define IDC_SUPPORTAMBIGUOUSUUID 1484 #define IDC_CLONE_URL 1484 #define IDC_BUTTON_BROWSE_SOURCE_BRANCH2 1484 -- 2.11.4.GIT