From a073a848ff3ea96ad6e435655d10d14d52616691 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sat, 21 Jun 2014 18:15:31 +0200
Subject: [PATCH] Add start and pre commit hooks

(fixes issue #1605)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 .../en/TortoiseGit/tgit_dug/dug_settings_hooks.xml |  6 ++--
 src/Changelog.txt                                  |  1 +
 src/TortoiseProc/Commands/CommitCommand.cpp        | 14 ---------
 src/TortoiseProc/CommitDlg.cpp                     | 35 ++++++++++++++++++++++
 src/TortoiseProc/CommitDlg.h                       |  1 +
 src/TortoiseProc/Settings/SetHooksAdv.cpp          |  2 +-
 src/Utils/Hooks.cpp                                | 12 ++++++--
 src/Utils/Hooks.h                                  |  6 +++-
 8 files changed, 56 insertions(+), 21 deletions(-)

diff --git a/doc/source/en/TortoiseGit/tgit_dug/dug_settings_hooks.xml b/doc/source/en/TortoiseGit/tgit_dug/dug_settings_hooks.xml
index 607f2621a..d06fbc1c2 100644
--- a/doc/source/en/TortoiseGit/tgit_dug/dug_settings_hooks.xml
+++ b/doc/source/en/TortoiseGit/tgit_dug/dug_settings_hooks.xml
@@ -35,7 +35,6 @@
 	<para>
 		There are currently six types of hook script available
 		<variablelist>
-			<!--
 			<varlistentry>
 				<term>Start-commit</term>
 				<listitem>
@@ -59,6 +58,7 @@
 					</para>
 				</listitem>
 			</varlistentry>
+			<!--
 			<varlistentry>
 				<term>Post-commit</term>
 				<listitem>
@@ -102,7 +102,6 @@
 		by TortoiseGit. The parameters passed depend upon which hook is called.
 		Each hook has its own parameters which are passed in the following order:
 		<variablelist>
-			<!--
 			<varlistentry>
 				<term>Start-commit</term>
 				<listitem condition="pot">
@@ -123,6 +122,7 @@
 					</para>
 				</listitem>
 			</varlistentry>
+			<!--
 			<varlistentry>
 				<term>Post-commit</term>
 				<listitem condition="pot">
@@ -178,7 +178,7 @@
 						Path to a file containing the log message for
 						the commit. The file contains the text in UTF-8
 						encoding. After successful execution of the
-						start-commit hook, the log message is read back,
+						start-commit and pre-commit hooks, the log message is read back,
 						giving the hook a chance to modify it.
 					</para>
 				</listitem>
diff --git a/src/Changelog.txt b/src/Changelog.txt
index d52479e32..55e0421e9 100644
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -3,6 +3,7 @@ Released: unreleased
 
 == Features ==
  * Updated shipped libgit2 to version 0.21
+ * Fixed issue #1605: Add TortoiseGit start and pre commit hooks
 
 == Bug Fixes ==
  * Fixed issue #2216: Add fails with message: libgit2: "failed to parse 'warn' as boolean"
diff --git a/src/TortoiseProc/Commands/CommitCommand.cpp b/src/TortoiseProc/Commands/CommitCommand.cpp
index 7012b89d0..efc8e9ce2 100644
--- a/src/TortoiseProc/Commands/CommitCommand.cpp
+++ b/src/TortoiseProc/Commands/CommitCommand.cpp
@@ -51,20 +51,6 @@ bool CommitCommand::Execute()
 	}
 	CString sLogMsg = LoadLogMessage();
 	bool bSelectFilesForCommit = !!DWORD(CRegStdDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE));
-#if 0
-	DWORD exitcode = 0;
-	CString error;
-	if (CHooks::Instance().StartCommit(pathList, sLogMsg, exitcode, error))
-	{
-		if (exitcode)
-		{
-			CString temp;
-			temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
-			CMessageBox::Show(hwndExplorer, temp, _T("TortoiseGit"), MB_ICONERROR);
-			return false;
-		}
-	}
-#endif
 
 	if (!GitAdminDir().HasAdminDir(g_Git.m_CurrentDir)) {
 		CMessageBox::Show(hwndExplorer, IDS_NOWORKINGCOPY, IDS_APPNAME, MB_ICONERROR);
diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index a1e6b1bbb..a7c73a6c3 100644
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -194,6 +194,7 @@ BOOL CCommitDlg::OnInitDialog()
 		bool loadedMsg = !CGit::LoadTextFile(dotGitPath + _T("MERGE_MSG"), m_sLogMessage);
 		loadedMsg = loadedMsg && !CGit::LoadTextFile(dotGitPath + _T("SQUASH_MSG"), m_sLogMessage);
 	}
+	RunStartCommitHook();
 
 	if (CTGitPath(g_Git.m_CurrentDir).IsMergeActive())
 	{
@@ -555,6 +556,23 @@ void CCommitDlg::OnOK()
 			return;
 	}
 
+	if (CHooks::Instance().IsHookPresent(pre_commit_hook, g_Git.m_CurrentDir)) {
+		DWORD exitcode = 0xFFFFFFFF;
+		CString error;
+		CTGitPathList list;
+		m_ListCtrl.WriteCheckedNamesToPathList(list);
+		if (CHooks::Instance().PreCommit(g_Git.m_CurrentDir, list, m_sLogMessage, exitcode, error))
+		{
+			if (exitcode)
+			{
+				CString temp;
+				temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
+				MessageBox(temp, _T("TortoiseGit"), MB_ICONERROR);
+				return;
+			}
+		}
+	}
+
 	int nListItems = m_ListCtrl.GetItemCount();
 	bool needResetIndex = false;
 	for (int i = 0; i < nListItems && !m_bCommitMessageOnly; ++i)
@@ -968,6 +986,7 @@ void CCommitDlg::OnOK()
 			{
 				this->m_sLogMessage.Empty();
 				GetCommitTemplate(m_sLogMessage);
+				RunStartCommitHook();
 				m_cLogMessage.SetText(m_sLogMessage);
 				if (m_bCreateNewBranch)
 				{
@@ -2580,3 +2599,19 @@ void CCommitDlg::OnBnClickedCommitSetauthor()
 	else
 		GetDlgItem(IDC_COMMIT_AUTHORDATA)->ShowWindow(SW_HIDE);
 }
+
+void CCommitDlg::RunStartCommitHook()
+{
+	DWORD exitcode = 0xFFFFFFFF;
+	CString error;
+	if (CHooks::Instance().StartCommit(g_Git.m_CurrentDir, m_pathList, m_sLogMessage, exitcode, error))
+	{
+		if (exitcode)
+		{
+			CString temp;
+			temp.Format(IDS_ERR_HOOKFAILED, (LPCTSTR)error);
+			MessageBox(temp, _T("TortoiseGit"), MB_ICONERROR);
+			return;
+		}
+	}
+}
diff --git a/src/TortoiseProc/CommitDlg.h b/src/TortoiseProc/CommitDlg.h
index 0a60ca9d8..5a614d40a 100644
--- a/src/TortoiseProc/CommitDlg.h
+++ b/src/TortoiseProc/CommitDlg.h
@@ -125,6 +125,7 @@ protected:
 	void SaveSplitterPos();
 	void UpdateCheckLinks();
 	void ParseRegexFile(const CString& sFile, std::map<CString, CString>& mapRegex);
+	void RunStartCommitHook();
 
 	DECLARE_MESSAGE_MAP()
 
diff --git a/src/TortoiseProc/Settings/SetHooksAdv.cpp b/src/TortoiseProc/Settings/SetHooksAdv.cpp
index b9571a539..f9b104752 100644
--- a/src/TortoiseProc/Settings/SetHooksAdv.cpp
+++ b/src/TortoiseProc/Settings/SetHooksAdv.cpp
@@ -59,11 +59,11 @@ BOOL CSetHooksAdv::OnInitDialog()
 
 	// initialize the combo box with all the hook types we have
 	int index;
-	/*
 	index = m_cHookTypeCombo.AddString(CString(MAKEINTRESOURCE(IDS_HOOKTYPE_STARTCOMMIT)));
 	m_cHookTypeCombo.SetItemData(index, start_commit_hook);
 	index = m_cHookTypeCombo.AddString(CString(MAKEINTRESOURCE(IDS_HOOKTYPE_PRECOMMIT)));
 	m_cHookTypeCombo.SetItemData(index, pre_commit_hook);
+	/*
 	index = m_cHookTypeCombo.AddString(CString(MAKEINTRESOURCE(IDS_HOOKTYPE_POSTCOMMIT)));
 	m_cHookTypeCombo.SetItemData(index, post_commit_hook);
 	*/
diff --git a/src/Utils/Hooks.cpp b/src/Utils/Hooks.cpp
index dd716ed21..de0f11fb3 100644
--- a/src/Utils/Hooks.cpp
+++ b/src/Utils/Hooks.cpp
@@ -246,16 +246,18 @@ bool CHooks::StartCommit(const CString& workingTree, const CTGitPathList& pathLi
 	return true;
 }
 
-bool CHooks::PreCommit(const CString& workingTree, const CTGitPathList& pathList, const CString& message, DWORD& exitcode, CString& error)
+bool CHooks::PreCommit(const CString& workingTree, const CTGitPathList& pathList, CString& message, DWORD& exitcode, CString& error)
 {
 	auto it = FindItem(pre_commit_hook, workingTree);
 	if (it == end())
 		return false;
 	CString sCmd = it->second.commandline;
 	AddPathParam(sCmd, pathList);
-	AddMessageFileParam(sCmd, message);
+	CTGitPath temppath = AddMessageFileParam(sCmd, message);
 	AddCWDParam(sCmd, workingTree);
 	exitcode = RunScript(sCmd, workingTree, error, it->second.bWait, it->second.bShow);
+	if (!exitcode && !temppath.IsEmpty())
+		CStringUtils::ReadStringFromTextFile(temppath.GetWinPathString(), message);
 	return true;
 }
 
@@ -300,6 +302,12 @@ bool CHooks::PostPush(const CString& workingTree, DWORD& exitcode, CString& erro
 	return true;
 }
 
+bool CHooks::IsHookPresent(hooktype t, const CString& workingTree) const
+{
+	auto it = FindItem(t, workingTree);
+	return it != end();
+}
+
 const_hookiterator CHooks::FindItem(hooktype t, const CString& workingTree) const
 {
 	hookkey key;
diff --git a/src/Utils/Hooks.h b/src/Utils/Hooks.h
index 94e0235e5..ae9bd336d 100644
--- a/src/Utils/Hooks.h
+++ b/src/Utils/Hooks.h
@@ -145,9 +145,11 @@ public:
 	 * replaced with the path to a temporary file which contains a list of files
 	 * in \c pathList, separated by newlines. The hook script can parse this
 	 * file to get all the paths the update is about to be done on.
+	 * If the script finishes successfully, contents of this file is read back
+	 * into \c message parameter.
 	 */
 	bool				PreCommit(const CString& workingTree, const CTGitPathList& pathList,
-									const CString& message, DWORD& exitcode,
+									CString& message, DWORD& exitcode,
 									CString& error);
 	/**
 	 * Executes the Post-Commit-Hook that first matches the path in
@@ -170,6 +172,8 @@ public:
 	bool	PrePush(const CString& workingTree, DWORD& exitcode, CString& error);
 	bool	PostPush(const CString& workingTree, DWORD& exitcode, CString& error);
 
+	bool	IsHookPresent(hooktype t, const CString& workingTree) const;
+
 private:
 	/**
 	 * Starts a new process, specified in \c cmd.
-- 
2.11.4.GIT