From 5ea604f00c568b6811f9b55b799c296dc06b7899 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Sat, 12 Jan 2013 17:20:51 +0800
Subject: [PATCH] Log dialog can revert selected files to parent revision

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 Languages/Tortoise.pot                         |   4 +++
 doc/images/en/LogContextMenu2.png              | Bin 8840 -> 5327 bytes
 doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml |   8 +++++
 src/Changelog.txt                              |   8 ++++-
 src/Git/GitStatusListCtrl.cpp                  |  47 +++++++++++++++++++++----
 src/Git/GitStatusListCtrl.h                    |   5 +--
 src/Resources/LoglistCommonResource.h          |   1 +
 src/Resources/TortoiseLoglistCommon.rc2        |   1 +
 8 files changed, 64 insertions(+), 10 deletions(-)
 rewrite doc/images/en/LogContextMenu2.png (99%)

diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot
index 42903a889..b284e8a1a 100644
--- a/Languages/Tortoise.pot
+++ b/Languages/Tortoise.pot
@@ -6750,6 +6750,10 @@ msgstr ""
 msgid "Revert commit %s"
 msgstr ""
 
+#. Resource IDs: (1252)
+msgid "Revert to parent revision"
+msgstr ""
+
 #. Resource IDs: (323)
 #, c-format
 msgid "Revert to revision %s"
diff --git a/doc/images/en/LogContextMenu2.png b/doc/images/en/LogContextMenu2.png
dissimilarity index 99%
index 8793ee477fe0bed023c93b7d2bfe1e7200b3cd67..2841750faf4ee93e8411a178d34cc0af08b84d2d 100644
GIT binary patch
literal 5327
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%0DfTkDHQ
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

literal 8840
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

diff --git a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
index 480016df0..ac1519e36 100644
--- a/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
+++ b/doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
@@ -466,6 +466,14 @@
 					</listitem>
 				</varlistentry>
 				<varlistentry>
+					<term>Revert changes to parent revision</term>
+					<listitem>
+						<para>
+							Revert chosen files to parent revision.
+						</para>
+					</listitem>
+				</varlistentry>
+				<varlistentry>
 					<term>Show log</term>
 					<listitem>
 						<para>
diff --git a/src/Changelog.txt b/src/Changelog.txt
index 477711793..77c0018bf 100644
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -1,4 +1,10 @@
-= Release 1.7.16.0 =
+= Release 1.8.1.0 =
+Released: unreleased
+
+== Features ==
+ * Log dialog can revert selected files to parent revision
+
+= Release 1.8.0.0 =
 Released: unreleased
 
 == Features ==
diff --git a/src/Git/GitStatusListCtrl.cpp b/src/Git/GitStatusListCtrl.cpp
index 3b46dc8b9..61a1c6f2b 100644
--- a/src/Git/GitStatusListCtrl.cpp
+++ b/src/Git/GitStatusListCtrl.cpp
@@ -1,6 +1,6 @@
 // TortoiseGit - a Windows shell extension for easy version control
 
-// Copyright (C) 2008-2012 - TortoiseGit
+// Copyright (C) 2008-2013 - TortoiseGit
 // Copyright (C) 2003-2008 - TortoiseSVN
 // Copyright (C) 2010-2012 Sven Strickroth <email@cs-ware.de>
 
@@ -1625,6 +1625,12 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
 				{
 					popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
 				}
+
+				if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOPARENT)) && ( !this->m_CurrentVersion.IsEmpty() )
+					&& this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_ADDED))
+				{
+					popup.AppendMenuIcon(IDGITLC_REVERTTOPARENT, IDS_LOG_POPUP_REVERTTOPARENT, IDI_REVERT);
+				}
 			}
 
 			if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
@@ -2354,6 +2360,9 @@ void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
 			case IDGITLC_REVERTTOREV:
 				RevertSelectedItemToVersion();
 				break;
+			case IDGITLC_REVERTTOPARENT:
+				RevertSelectedItemToVersion(true);
+				break;
 #if 0
 			case IDSVNLC_COMMIT:
 				{
@@ -4161,7 +4170,7 @@ void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
 
 }
 
-int CGitStatusListCtrl::RevertSelectedItemToVersion()
+int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent)
 {
 	if(this->m_CurrentVersion.IsEmpty())
 		return 0;
@@ -4171,22 +4180,46 @@ int CGitStatusListCtrl::RevertSelectedItemToVersion()
 	POSITION pos = GetFirstSelectedItemPosition();
 	int index;
 	CString cmd,out;
-	int count =0;
+	std::map<CString, int> versionMap;
 	while ((index = GetNextSelectedItem(pos)) >= 0)
 	{
 		CTGitPath *fentry=(CTGitPath*)GetItemData(index);
-		cmd.Format(_T("git.exe checkout %s -- \"%s\""),m_CurrentVersion,fentry->GetGitPathString());
+		CString version;
+		if (parent)
+		{
+			int parentNo = fentry->m_ParentNo & PARENT_MASK;
+			CString ref;
+			ref.Format(_T("%s^%d"), m_CurrentVersion, parentNo + 1);
+			CGitHash hash;
+			if (g_Git.GetHash(hash, ref))
+			{
+				MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of ref \"") + ref + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
+				continue;
+			}
+
+			version = hash.ToString();
+		}
+		else
+			version = m_CurrentVersion;
+
+		cmd.Format(_T("git.exe checkout %s -- \"%s\""), version, fentry->GetGitPathString());
 		out.Empty();
 		if (g_Git.Run(cmd, &out, CP_UTF8))
 		{
 			if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
-				break;
+				continue;
 		}
 		else
-			count++;
+			versionMap[version]++;
 	}
 
-	out.Format(IDS_STATUSLIST_FILESREVERTED, count, m_CurrentVersion);
+	out.Empty();
+	for (auto it = versionMap.begin(); it != versionMap.end(); ++it)
+	{
+		CString versionEntry;
+		versionEntry.Format(IDS_STATUSLIST_FILESREVERTED, it->second, it->first);
+		out += versionEntry + _T("\r\n");
+	}
 	CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
 	return 0;
 }
diff --git a/src/Git/GitStatusListCtrl.h b/src/Git/GitStatusListCtrl.h
index 4d8ba1336..79d6d6cba 100644
--- a/src/Git/GitStatusListCtrl.h
+++ b/src/Git/GitStatusListCtrl.h
@@ -1,6 +1,6 @@
 // TortoiseGit - a Windows shell extension for easy version control
 
-// Copyright (C) 2008-2012 - TortoiseGit
+// Copyright (C) 2008-2013 - TortoiseGit
 // Copyright (C) 2003-2008 - TortoiseSVN
 // Copyright (C) 2010-2012 Sven Strickroth <email@cs-ware.de>
 
@@ -494,6 +494,7 @@ public:
 		IDGITLC_BLAME			,
 		IDGITLC_SAVEAS			,
 		IDGITLC_REVERTTOREV		,
+		IDGITLC_REVERTTOPARENT	,
 		IDGITLC_VIEWREV			,
 		IDGITLC_FINDENTRY       ,
 		IDGITLC_COMPARETWO		,
@@ -1046,7 +1047,7 @@ private:
 
 	void FilesExport();
 	void FileSaveAs(CTGitPath *path);
-	int RevertSelectedItemToVersion();
+	int RevertSelectedItemToVersion(bool parent = false);
 
 private:
 	bool *						m_pbCanceled;
diff --git a/src/Resources/LoglistCommonResource.h b/src/Resources/LoglistCommonResource.h
index 29de4901a..37094d6f6 100644
--- a/src/Resources/LoglistCommonResource.h
+++ b/src/Resources/LoglistCommonResource.h
@@ -131,3 +131,4 @@
 #define IDS_PATHACTIONS_UNKNOWN         20114
 
 #define IDS_LOG_POPUP_EXPORT            20115
+#define IDS_LOG_POPUP_REVERTTOPARENT    20116
diff --git a/src/Resources/TortoiseLoglistCommon.rc2 b/src/Resources/TortoiseLoglistCommon.rc2
index 538685a8c..c6ce5ef05 100644
--- a/src/Resources/TortoiseLoglistCommon.rc2
+++ b/src/Resources/TortoiseLoglistCommon.rc2
@@ -43,6 +43,7 @@ BEGIN
     IDS_LOG_POPUP_COPYTOCLIPBOARD "Copy to clipboard"
     IDS_LOG_POPUP_COPYTOCLIPBOARDMESSAGES "Copy log messages to clipboard"
     IDS_LOG_POPUP_REVERTTOREV "R&evert to this revision"
+    IDS_LOG_POPUP_REVERTTOPARENT "Revert to parent revision"
     IDS_LOG_POPUP_EXPORT "Export selection to..."
     IDS_LOG_POPUP_BLAMEREVS "&Blame revisions"
     IDS_LOG_POPUP_BLAMEDIFF "&Blame changes"
-- 
2.11.4.GIT