Build Log Dlg Okay

diff --git a/Git/Git.cpp b/Git/Git.cpp
index b830215..61930cd 100644 (file)
--- a/Git/Git.cpp
+++ b/Git/Git.cpp
@@ -3,8 +3,11 @@
 #include "atlconv.h"\r
 #include "afx.h"\r
 \r
+#define MAX_DIRBUFFER 1000\r
+CGit g_Git;\r
 CGit::CGit(void)\r
 {\r
+       GetCurrentDirectory(MAX_DIRBUFFER,m_CurrentDir.GetBuffer(MAX_DIRBUFFER));\r
 }\r
 \r
 CGit::~CGit(void)\r
@@ -37,7 +40,7 @@ int CGit::Run(CString cmd, CString* output)
        si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;\r
 \r
        \r
-       if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,NULL,&si,&pi))\r
+       if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,NULL,NULL,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))\r
        {\r
                LPVOID lpMsgBuf;\r
                FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,\r
@@ -77,3 +80,16 @@ CString CGit::GetUserEmail(void)
        Run(_T("git.cmd config user.email"),&UserName);\r
        return UserName;\r
 }\r
+\r
+CString CGit::GetCurrentBranch(void)\r
+{\r
+       CString branch;\r
+       Run(_T("git.cmd branch"),&branch);\r
+       if(branch.GetLength()>0)\r
+       {\r
+               branch.Replace(_T('*'),_T(' '));\r
+               branch.TrimLeft();\r
+               return branch;\r
+       }\r
+       return CString("");\r
+}\r

diff --git a/Git/Git.h b/Git/Git.h
index a7ffbc1..2712c1b 100644 (file)
--- a/Git/Git.h
+++ b/Git/Git.h
@@ -15,4 +15,8 @@ public:
        int Run(CString cmd, CString* output);\r
        CString GetUserName(void);\r
        CString GetUserEmail(void);\r
+       CString GetCurrentBranch(void);\r
+       CString m_CurrentDir;\r
 };\r
+\r
+extern CGit g_Git;
\ No newline at end of file

diff --git a/Resources/TortoiseProcENG.rc b/Resources/TortoiseProcENG.rc
index cca218e..3bb0357 100644 (file)
Binary files a/Resources/TortoiseProcENG.rc and b/Resources/TortoiseProcENG.rc differ

diff --git a/TortoiseProc/Blame.h b/TortoiseProc/Blame.h
index 0ef19f3..ea5d03a 100644 (file)
--- a/TortoiseProc/Blame.h
+++ b/TortoiseProc/Blame.h
@@ -1,6 +1,6 @@
-// TortoiseSVN - a Windows shell extension for easy version control\r
+// TortoiseGit - a Windows shell extension for easy version control\r
 \r
-// Copyright (C) 2003-2008 - TortoiseSVN\r
+// Copyright (C) 2003-2008 - TortoiseGit\r
 \r
 // This program is free software; you can redistribute it and/or\r
 // modify it under the terms of the GNU General Public License\r
@@ -15,21 +15,22 @@
 // You should have received a copy of the GNU General Public License\r
 // along with this program; if not, write to the Free Software Foundation,\r
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
-//\r
+//     \r
 \r
 #pragma once\r
-#include "SVN.h"\r
+#include "Git.h"\r
 #include "ProgressDlg.h"\r
-#include "SVNRev.h"\r
+#include "GitRev.h"\r
 #include "StdioFileT.h"\r
+#include "GitStatus.h"\r
 \r
-class CTSVNPath;\r
+class CTGitPath;\r
 \r
 /**\r
  * \ingroup TortoiseProc\r
  * Helper class to get the blame information for a file.\r
  */\r
-class CBlame : public SVN\r
+class CBlame : public CGit\r
 {\r
 public:\r
        CBlame();\r
@@ -45,21 +46,21 @@ public:
         * \param path the path to the file to determine the required information\r
         * \return The path to the temporary file or an empty string in case of an error.\r
         */\r
-       CString         BlameToTempFile(const CTSVNPath& path, SVNRev startrev, SVNRev endrev, SVNRev pegrev, CString& logfile, const CString& options, BOOL includemerge, BOOL showprogress, BOOL ignoremimetype);\r
+       CString         BlameToTempFile(const CTGitPath& path, GitRev startrev, GitRev endrev, GitRev pegrev, CString& logfile, const CString& options, BOOL includemerge, BOOL showprogress, BOOL ignoremimetype);\r
 \r
-       bool            BlameToFile(const CTSVNPath& path, SVNRev startrev, SVNRev endrev, SVNRev peg, const CTSVNPath& tofile, const CString& options, BOOL ignoremimetype, BOOL includemerge);\r
+       bool            BlameToFile(const CTGitPath& path, GitRev startrev, GitRev endrev, GitRev peg, const CTGitPath& tofile, const CString& options, BOOL ignoremimetype, BOOL includemerge);\r
 private:\r
-       BOOL            BlameCallback(LONG linenumber, svn_revnum_t revision, const CString& author, const CString& date,\r
-                                                               svn_revnum_t merged_revision, const CString& merged_author, const CString& merged_date, const CString& merged_path,\r
+       BOOL            BlameCallback(LONG linenumber, git_revnum_t revision, const CString& author, const CString& date,\r
+                                                               git_revnum_t merged_revision, const CString& merged_author, const CString& merged_date, const CString& merged_path,\r
                                                                const CStringA& line);\r
        BOOL            Cancel();\r
-       BOOL            Notify(const CTSVNPath& path, svn_wc_notify_action_t action, \r
-                                               svn_node_kind_t kind, const CString& mime_type, \r
-                                               svn_wc_notify_state_t content_state, \r
-                                               svn_wc_notify_state_t prop_state, LONG rev,\r
-                                               const svn_lock_t * lock, svn_wc_notify_lock_state_t lock_state,\r
-                                               svn_error_t * err, apr_pool_t * pool);\r
-       BOOL            Log(svn_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths, apr_time_t time, int filechanges, BOOL copies, DWORD actions, BOOL haschildren);\r
+       BOOL            Notify(const CTGitPath& path, git_wc_notify_action_t action, \r
+                                               git_node_kind_t kind, const CString& mime_type, \r
+                                               git_wc_notify_state_t content_state, \r
+                                               git_wc_notify_state_t prop_state, LONG rev,\r
+                                               const git_lock_t * lock, git_wc_notify_lock_state_t lock_state,\r
+                                               git_error_t * err, apr_pool_t * pool);\r
+       BOOL            Log(git_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths, apr_time_t time, int filechanges, BOOL copies, DWORD actions, BOOL haschildren);\r
 private:\r
        BOOL            m_bCancelled;                   ///< TRUE if the operation should be canceled\r
        LONG            m_nCounter;                             ///< Counts the number of calls to the Cancel() callback (revisions?)\r

diff --git a/TortoiseProc/Commands/LogCommand.cpp b/TortoiseProc/Commands/LogCommand.cpp
index 60914c5..e19501e 100644 (file)
--- a/TortoiseProc/Commands/LogCommand.cpp
+++ b/TortoiseProc/Commands/LogCommand.cpp
@@ -25,6 +25,7 @@ bool LogCommand::Execute()
 {\r
        //the log command line looks like this:\r
        //command:log path:<path_to_file_or_directory_to_show_the_log_messages> [startrev:<startrevision>] [endrev:<endrevision>]\r
+#if 0 \r
        CString val = parser.GetVal(_T("startrev"));\r
        if ( val.IsEmpty() )\r
        {\r
@@ -63,13 +64,14 @@ bool LogCommand::Execute()
        {\r
                bStrict = TRUE;\r
        }\r
+#endif\r
        CLogDlg dlg;\r
        theApp.m_pMainWnd = &dlg;\r
-       dlg.SetParams(cmdLinePath, pegrev, revstart, revend, limit, bStrict);\r
-       dlg.SetIncludeMerge(!!parser.HasKey(_T("merge")));\r
-       val = parser.GetVal(_T("propspath"));\r
-       if (!val.IsEmpty())\r
-               dlg.SetProjectPropertiesPath(CTSVNPath(val));\r
+//     dlg.SetParams(cmdLinePath, pegrev, revstart, revend, limit, bStrict);\r
+//     dlg.SetIncludeMerge(!!parser.HasKey(_T("merge")));\r
+//     val = parser.GetVal(_T("propspath"));\r
+//     if (!val.IsEmpty())\r
+//             dlg.SetProjectPropertiesPath(CTSVNPath(val));\r
        dlg.DoModal();                  \r
        return true;\r
 }\r

diff --git a/TortoiseProc/CommitDlg.cpp b/TortoiseProc/CommitDlg.cpp
index d5acd76..c0236aa 100644 (file)
--- a/TortoiseProc/CommitDlg.cpp
+++ b/TortoiseProc/CommitDlg.cpp
@@ -92,6 +92,7 @@ BEGIN_MESSAGE_MAP(CCommitDlg, CResizableStandAloneDialog)
     ON_WM_SIZE()\r
        ON_STN_CLICKED(IDC_EXTERNALWARNING, &CCommitDlg::OnStnClickedExternalwarning)\r
        ON_BN_CLICKED(IDC_SIGN_OFF, &CCommitDlg::OnBnClickedSignOff)\r
+       ON_STN_CLICKED(IDC_COMMITLABEL, &CCommitDlg::OnStnClickedCommitlabel)\r
 END_MESSAGE_MAP()\r
 \r
 BOOL CCommitDlg::OnInitDialog()\r
@@ -175,6 +176,7 @@ BOOL CCommitDlg::OnInitDialog()
                }\r
        }\r
        else\r
+#endif\r
        {\r
                GetDlgItem(IDC_BUGID)->ShowWindow(SW_HIDE);\r
                GetDlgItem(IDC_BUGIDLABEL)->ShowWindow(SW_HIDE);\r
@@ -182,7 +184,7 @@ BOOL CCommitDlg::OnInitDialog()
                GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);\r
                GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
        }\r
-#endif\r
+\r
        if (!m_sLogMessage.IsEmpty())\r
                m_cLogMessage.SetText(m_sLogMessage);\r
                \r
@@ -610,7 +612,8 @@ UINT CCommitDlg::StatusThread()
                        GetDlgItem(IDC_EXTERNALWARNING)->ShowWindow(SW_SHOW);\r
                        DialogEnableWindow(IDC_EXTERNALWARNING, TRUE);\r
                }\r
-               SetDlgItemText(IDC_COMMIT_TO, m_ListCtrl.m_sURL);\r
+               \r
+               SetDlgItemText(IDC_COMMIT_TO, g_Git.GetCurrentBranch());\r
                m_tooltips.AddTool(GetDlgItem(IDC_STATISTICS), m_ListCtrl.GetStatisticsString());\r
        }\r
        CString logmsg;\r
@@ -1359,3 +1362,8 @@ void CCommitDlg::OnBnClickedSignOff()
        str.Format(_T("Signed-off-by: %s <%s>\n"),git.GetUserName(), git.GetUserEmail());\r
        m_cLogMessage.InsertText(str,true);\r
 }\r
+\r
+void CCommitDlg::OnStnClickedCommitlabel()\r
+{\r
+       // TODO: Add your control notification handler code here\r
+}\r

diff --git a/TortoiseProc/CommitDlg.h b/TortoiseProc/CommitDlg.h
index f805a72..e4bb91d 100644 (file)
--- a/TortoiseProc/CommitDlg.h
+++ b/TortoiseProc/CommitDlg.h
@@ -29,6 +29,7 @@
 #include "BugTraqAssociations.h"\r
 #include "Tooltip.h"\r
 //#include "..\IBugTraqProvider\IBugTraqProvider_h.h"\r
+#include "Git.h"\r
 \r
 #include <regex>\r
 using namespace std;\r
@@ -137,4 +138,5 @@ private:
 \r
 public:\r
        afx_msg void OnBnClickedSignOff();\r
+       afx_msg void OnStnClickedCommitlabel();\r
 };\r

diff --git a/TortoiseProc/ILogReceiver.h b/TortoiseProc/ILogReceiver.h
new file mode 100644 (file)
index 0000000..362a0de
--- /dev/null
+++ b/TortoiseProc/ILogReceiver.h
@@ -0,0 +1,140 @@
+// TortoiseSVN - a Windows shell extension for easy version control\r
+\r
+// Copyright (C) 2007-2007 - TortoiseSVN\r
+\r
+// This program is free software; you can redistribute it and/or\r
+// modify it under the terms of the GNU General Public License\r
+// as published by the Free Software Foundation; either version 2\r
+// of the License, or (at your option) any later version.\r
+\r
+// This program is distributed in the hope that it will be useful,\r
+// but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+// GNU General Public License for more details.\r
+\r
+// You should have received a copy of the GNU General Public License\r
+// along with this program; if not, write to the Free Software Foundation,\r
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
+//\r
+#pragma once\r
+\r
+///////////////////////////////////////////////////////////////\r
+// temporarily used to disambiguate LogChangedPath definitions\r
+///////////////////////////////////////////////////////////////\r
+\r
+#ifndef __ILOGRECEIVER_H__\r
+#define __ILOGRECEIVER_H__\r
+#endif\r
+\r
+///////////////////////////////////////////////////////////////\r
+// required includes\r
+///////////////////////////////////////////////////////////////\r
+\r
+//#include "svn_types.h"\r
+\r
+\r
+/**\r
+ * data structure to accommodate the change list.\r
+ */\r
+struct LogChangedPath\r
+{\r
+       CString sPath;\r
+//     CString sCopyFromPath;\r
+       git_revnum_t lCopyFromRev;\r
+       DWORD action;\r
+\r
+       /// returns the action as a string\r
+       const CString& GetAction() const;\r
+\r
+private:\r
+\r
+       /// cached return value of GetAction()\r
+       mutable CString actionAsString;\r
+};\r
+\r
+enum\r
+{\r
+       LOGACTIONS_ADDED        = 0x00000001,\r
+       LOGACTIONS_MODIFIED     = 0x00000002,\r
+       LOGACTIONS_REPLACED     = 0x00000004,\r
+       LOGACTIONS_DELETED      = 0x00000008\r
+};\r
+\r
+/// auto-deleting extension of MFC Arrays for pointer arrays\r
+\r
+template<class T>\r
+class CAutoArray : public CArray<T*,T*>\r
+{\r
+public:\r
+\r
+    // default and copy construction\r
+\r
+    CAutoArray() \r
+    {\r
+    }\r
+\r
+    CAutoArray (const CAutoArray& rhs)\r
+    {\r
+        Copy (rhs);\r
+    }\r
+\r
+    // destruction deletes members\r
+\r
+    ~CAutoArray()\r
+    {\r
+           for (INT_PTR i = 0, count = GetCount(); i < count; ++i)\r
+                   delete GetAt (i);\r
+    }\r
+};\r
+\r
+typedef CAutoArray<LogChangedPath> LogChangedPathArray;\r
+\r
+/**\r
+ * standard revision properties\r
+ */\r
+\r
+struct StandardRevProps\r
+{\r
+    CString author;\r
+//    apr_time_t timeStamp;\r
+    CString message;\r
+};\r
+\r
+/**\r
+ * data structure to accommodate the list of user-defined revision properties.\r
+ */\r
+struct UserRevProp\r
+{\r
+       CString name;\r
+       CString value;\r
+};\r
+\r
+typedef CAutoArray<UserRevProp> UserRevPropArray;\r
+\r
+\r
+/**\r
+ * Interface for receiving log information. It will be used as a callback\r
+ * in ILogQuery::Log().\r
+ *\r
+ * To cancel the log and/or indicate errors, throw an SVNError exception.\r
+ */\r
+class ILogReceiver\r
+{\r
+public:\r
+\r
+       /// call-back for every revision found\r
+       /// (called at most once per revision)\r
+    ///\r
+    /// the implementation may modify but not delete()\r
+    /// the data containers passed to it\r
+    ///\r
+    /// any pointer may be NULL\r
+       ///\r
+       /// may throw a SVNError to cancel the log\r
+\r
+       virtual void ReceiveLog ( LogChangedPathArray* changes\r
+                                                       , git_revnum_t rev\r
+                            , const StandardRevProps* stdRevProps\r
+                            , UserRevPropArray* userRevProps\r
+                            , bool mergesFollow) = 0;\r
+};\r

diff --git a/TortoiseProc/LogDlg.cpp b/TortoiseProc/LogDlg.cpp
index 4c1c1a6..5ba6f3a 100644 (file)
--- a/TortoiseProc/LogDlg.cpp
+++ b/TortoiseProc/LogDlg.cpp
@@ -1,6 +1,6 @@
-// TortoiseSVN - a Windows shell extension for easy version control\r
+// TortoiseGit - a Windows shell extension for easy version control\r
 \r
-// Copyright (C) 2003-2008 - TortoiseSVN\r
+// Copyright (C) 2003-2008 - TortoiseGit\r
 \r
 // This program is free software; you can redistribute it and/or\r
 // modify it under the terms of the GNU General Public License\r
@@ -23,9 +23,9 @@
 #include "PropDlg.h"\r
 #include "SVNProgressDlg.h"\r
 #include "ProgressDlg.h"\r
-#include "RepositoryBrowser.h"\r
-#include "CopyDlg.h"\r
-#include "StatGraphDlg.h"\r
+//#include "RepositoryBrowser.h"\r
+//#include "CopyDlg.h"\r
+//#include "StatGraphDlg.h"\r
 #include "Logdlg.h"\r
 #include "MessageBox.h"\r
 #include "Registry.h"\r
@@ -34,19 +34,19 @@
 #include "StringUtils.h"\r
 #include "UnicodeUtils.h"\r
 #include "TempFile.h"\r
-#include "SVNInfo.h"\r
-#include "SVNDiff.h"\r
+//#include "GitInfo.h"\r
+//#include "GitDiff.h"\r
 #include "IconMenu.h"\r
-#include "RevisionRangeDlg.h"\r
-#include "BrowseFolder.h"\r
-#include "BlameDlg.h"\r
-#include "Blame.h"\r
-#include "SVNHelpers.h"\r
-#include "SVNStatus.h"\r
-#include "LogDlgHelper.h"\r
-#include "CachedLogInfo.h"\r
-#include "RepositoryInfo.h"\r
-#include "EditPropertiesDlg.h"\r
+//#include "RevisionRangeDlg.h"\r
+//#include "BrowseFolder.h"\r
+//#include "BlameDlg.h"\r
+//#include "Blame.h"\r
+//#include "GitHelpers.h"\r
+#include "GitStatus.h"\r
+//#include "LogDlgHelper.h"\r
+//#include "CachedLogInfo.h"\r
+//#include "RepositoryInfo.h"\r
+//#include "EditPropertiesDlg.h"\r
 \r
 \r
 #if (NTDDI_VERSION < NTDDI_LONGHORN)\r
@@ -123,11 +123,11 @@ CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
        , m_nSortColumn(0)\r
        , m_bShowedAll(false)\r
        , m_bSelect(false)\r
-       , m_regLastStrict(_T("Software\\TortoiseSVN\\LastLogStrict"), FALSE)\r
-       , m_regMaxBugIDColWidth(_T("Software\\TortoiseSVN\\MaxBugIDColWidth"), 200)\r
+       , m_regLastStrict(_T("Software\\TortoiseGit\\LastLogStrict"), FALSE)\r
+       , m_regMaxBugIDColWidth(_T("Software\\TortoiseGit\\MaxBugIDColWidth"), 200)\r
        , m_bSelectionMustBeContinuous(false)\r
        , m_bShowBugtraqColumn(false)\r
-       , m_lowestRev(-1)\r
+       , m_lowestRev(_T(""))\r
        , m_bStrictStopped(false)\r
        , m_sLogInfo(_T(""))\r
        , m_pFindDialog(NULL)\r
@@ -143,7 +143,7 @@ CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/)
        , m_hAccel(NULL)\r
        , m_bVista(false)\r
 {\r
-       m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseSVN\\UseRegexFilter"), TRUE);\r
+       m_bFilterWithRegex = !!CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);\r
        // use the default GUI font, create a copy of it and\r
        // change the copy to BOLD (leave the rest of the font\r
        // the same)\r
@@ -229,7 +229,7 @@ BEGIN_MESSAGE_MAP(CLogDlg, CResizableStandAloneDialog)
        ON_COMMAND(ID_EDIT_COPY, &CLogDlg::OnEditCopy)\r
 END_MESSAGE_MAP()\r
 \r
-void CLogDlg::SetParams(const CTSVNPath& path, SVNRev pegrev, SVNRev startrev, SVNRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)\r
+void CLogDlg::SetParams(const CTGitPath& path, GitRev pegrev, GitRev startrev, GitRev endrev, int limit, BOOL bStrict /* = FALSE */, BOOL bSaveStrict /* = TRUE */)\r
 {\r
        m_path = path;\r
        m_pegrev = pegrev;\r
@@ -265,7 +265,7 @@ BOOL CLogDlg::OnInitDialog()
        if (m_limit)\r
                temp.Format(IDS_LOG_SHOWNEXT, m_limit);\r
        else\r
-               temp.Format(IDS_LOG_SHOWNEXT, (int)(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100));\r
+               temp.Format(IDS_LOG_SHOWNEXT, (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100));\r
 \r
        SetDlgItemText(IDC_NEXTHUNDRED, temp);\r
 \r
@@ -407,13 +407,15 @@ BOOL CLogDlg::OnInitDialog()
        AddAnchor(IDOK, BOTTOM_RIGHT);\r
        AddAnchor(IDCANCEL, BOTTOM_RIGHT);\r
        AddAnchor(IDHELP, BOTTOM_RIGHT);\r
-       SetPromptParentWindow(m_hWnd);\r
+\r
+//     SetPromptParentWindow(m_hWnd);\r
+\r
        if (hWndExplorer)\r
                CenterWindow(CWnd::FromHandle(hWndExplorer));\r
        EnableSaveRestore(_T("LogDlg"));\r
 \r
-       DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer1"));\r
-       DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer2"));\r
+       DWORD yPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));\r
+       DWORD yPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));\r
        RECT rcDlg, rcLogList, rcChgMsg;\r
        GetClientRect(&rcDlg);\r
        m_LogList.GetWindowRect(&rcLogList);\r
@@ -469,7 +471,7 @@ BOOL CLogDlg::OnInitDialog()
        m_btnShow.AddEntry(temp);\r
        temp.LoadString(IDS_LOG_SHOWRANGE);\r
        m_btnShow.AddEntry(temp);\r
-       m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseSVN\\ShowAllEntry")));\r
+       m_btnShow.SetCurrentEntry((LONG)CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry")));\r
 \r
        m_mergedRevs.clear();\r
 \r
@@ -668,22 +670,27 @@ void CLogDlg::OnBnClickedGetall()
 \r
 void CLogDlg::GetAll(bool bForceAll /* = false */)\r
 {\r
+#if 0\r
        // fetch all requested log messages, either the specified range or\r
        // really *all* available log messages.\r
        UpdateData();\r
        INT_PTR entry = m_btnShow.GetCurrentEntry();\r
        if (bForceAll)\r
                entry = 0;\r
+\r
        switch (entry)\r
        {\r
        case 0: // show all\r
+       \r
                m_endrev = 0;\r
                m_startrev = m_LogRevision;\r
                if (m_bStrict)\r
                        m_bShowedAll = true;\r
+\r
                break;\r
        case 1: // show range\r
                {\r
+\r
                        // ask for a revision range\r
                        CRevisionRangeDlg dlg;\r
                        dlg.SetStartRevision(m_startrev);\r
@@ -700,13 +707,14 @@ void CLogDlg::GetAll(bool bForceAll /* = false */)
                                if (((LONG)m_startrev < (LONG)m_endrev)||\r
                                        (m_endrev.IsHead()))\r
                                {\r
-                                       svn_revnum_t temp = m_startrev;\r
+                                       git_revnum_t temp = m_startrev;\r
                                        m_startrev = m_endrev;\r
                                        m_endrev = temp;\r
                                }\r
                        }\r
                        m_bShowedAll = false;\r
                }\r
+\r
                break;\r
        }\r
        m_ChangedFileListCtrl.SetItemCountEx(0);\r
@@ -742,6 +750,7 @@ void CLogDlg::GetAll(bool bForceAll /* = false */)
        }\r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
        InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+#endif\r
 }\r
 \r
 void CLogDlg::OnBnClickedRefresh()\r
@@ -752,6 +761,7 @@ void CLogDlg::OnBnClickedRefresh()
 \r
 void CLogDlg::Refresh (bool autoGoOnline)\r
 {\r
+#if 0\r
        // refreshing means re-downloading the already shown log messages\r
        UpdateData();\r
        m_maxChild = 0;\r
@@ -802,10 +812,12 @@ void CLogDlg::Refresh (bool autoGoOnline)
        }\r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
        InterlockedExchange(&m_bNoDispUpdates, FALSE);\r
+#endif\r
 }\r
 \r
 void CLogDlg::OnBnClickedNexthundred()\r
 {\r
+#if 0\r
        UpdateData();\r
        // we have to fetch the next X log messages.\r
        if (m_logEntries.size() < 1)\r
@@ -815,10 +827,11 @@ void CLogDlg::OnBnClickedNexthundred()
                // messages from.\r
                return GetAll(true);\r
        }\r
-       svn_revnum_t rev = m_logEntries[m_logEntries.size()-1]->Rev;\r
+       git_revnum_t rev = m_logEntries[m_logEntries.size()-1]->Rev;\r
 \r
        if (rev < 1)\r
                return;         // do nothing! No more revisions to get\r
+\r
        m_startrev = rev;\r
        m_endrev = 0;\r
        m_bCancelled = FALSE;\r
@@ -826,7 +839,7 @@ void CLogDlg::OnBnClickedNexthundred()
     // rev is is revision we already have and we will receive it again\r
     // -> fetch one extra revision to get NumberOfLogs *new* revisions\r
 \r
-       m_limit = (int)(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100) +1;\r
+       m_limit = (int)(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100) +1;\r
        InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
        SetSortArrow(&m_LogList, -1, true);\r
        InterlockedExchange(&m_bThreadRunning, TRUE);\r
@@ -846,6 +859,7 @@ void CLogDlg::OnBnClickedNexthundred()
        }\r
        InterlockedExchange(&m_bNoDispUpdates, TRUE);\r
        GetDlgItem(IDC_LOGLIST)->UpdateData(FALSE);\r
+#endif\r
 }\r
 \r
 BOOL CLogDlg::Cancel()\r
@@ -857,8 +871,8 @@ void CLogDlg::SaveSplitterPos()
 {\r
        if (!IsIconic())\r
        {\r
-               CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer1"));\r
-               CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\LogDlgSizer2"));\r
+               CRegDWORD regPos1 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer1"));\r
+               CRegDWORD regPos2 = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\LogDlgSizer2"));\r
                RECT rectSplitter;\r
                m_wndSplitter1.GetWindowRect(&rectSplitter);\r
                ScreenToClient(&rectSplitter);\r
@@ -886,7 +900,7 @@ void CLogDlg::OnCancel()
        UpdateData();\r
        if (m_bSaveStrict)\r
                m_regLastStrict = m_bStrict;\r
-       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\ShowAllEntry"));\r
+       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));\r
        reg = m_btnShow.GetCurrentEntry();\r
        SaveSplitterPos();\r
        __super::OnCancel();\r
@@ -918,13 +932,15 @@ CString CLogDlg::MakeShortMessage(const CString& message)
        return sShortMessage;\r
 }\r
 \r
-BOOL CLogDlg::Log(svn_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths, apr_time_t time, int filechanges, BOOL copies, DWORD actions, BOOL haschildren)\r
+BOOL CLogDlg::Log(git_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths,  int filechanges, BOOL copies, DWORD actions, BOOL haschildren)\r
 {\r
+#if 0\r
        if (rev == SVN_INVALID_REVNUM)\r
        {\r
                m_childCounter--;\r
                return TRUE;\r
        }\r
+\r
        // this is the callback function which receives the data for every revision we ask the log for\r
        // we store this information here one by one.\r
        m_logcounter += 1;\r
@@ -936,7 +952,7 @@ BOOL CLogDlg::Log(svn_revnum_t rev, const CString& author, const CString& date,
                m_LogProgress.SetPos(m_limit - m_limitcounter);\r
        }\r
        else if (m_startrev.IsNumber() && m_startrev.IsNumber())\r
-               m_LogProgress.SetPos((svn_revnum_t)m_startrev-rev+(svn_revnum_t)m_endrev);\r
+               m_LogProgress.SetPos((git_revnum_t)m_startrev-rev+(git_revnum_t)m_endrev);\r
        __time64_t ttime = time/1000000L;\r
        if (m_tTo < (DWORD)ttime)\r
                m_tTo = (DWORD)ttime;\r
@@ -1004,13 +1020,13 @@ BOOL CLogDlg::Log(svn_revnum_t rev, const CString& author, const CString& date,
        }\r
        catch (CException * e)\r
        {\r
-               ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseSVN"), MB_ICONERROR);\r
+               ::MessageBox(NULL, _T("not enough memory!"), _T("TortoiseGit"), MB_ICONERROR);\r
                e->Delete();\r
                m_bCancelled = TRUE;\r
        }\r
        m_logEntries.push_back(pLogItem);\r
        m_arShownList.Add(pLogItem);\r
-       \r
+#endif\r
        return TRUE;\r
 }\r
 \r
@@ -1024,6 +1040,7 @@ UINT CLogDlg::LogThreadEntry(LPVOID pVoid)
 //this is the thread function which calls the subversion function\r
 UINT CLogDlg::LogThread()\r
 {\r
+#if 0\r
        InterlockedExchange(&m_bThreadRunning, TRUE);\r
 \r
     //does the user force the cache to refresh (shift or control key down)?\r
@@ -1053,15 +1070,15 @@ UINT CLogDlg::LogThread()
        m_LogProgress.SetRange32(0, 100);\r
        m_LogProgress.SetPos(0);\r
        GetDlgItem(IDC_PROGRESS)->ShowWindow(TRUE);\r
-       svn_revnum_t r = -1;\r
+       git_revnum_t r = -1;\r
        \r
        // get the repository root url, because the changed-files-list has the\r
        // paths shown there relative to the repository root.\r
-       CTSVNPath rootpath;\r
+       CTGitPath rootpath;\r
     BOOL succeeded = GetRootAndHead(m_path, rootpath, r);\r
 \r
-    m_sRepositoryRoot = rootpath.GetSVNPathString();\r
-    m_sURL = m_path.GetSVNPathString();\r
+    m_sRepositoryRoot = rootpath.GetGitPathString();\r
+    m_sURL = m_path.GetGitPathString();\r
 \r
     // we need the UUID to unambigously identify the log cache\r
     if (logCachePool.IsEnabled())\r
@@ -1075,7 +1092,7 @@ UINT CLogDlg::LogThread()
         {\r
                m_sURL = GetURLFromPath(m_path);\r
 \r
-               // The URL is escaped because SVN::logReceiver\r
+               // The URL is escaped because Git::logReceiver\r
                // returns the path in a native format\r
                m_sURL = CPathUtils::PathUnescape(m_sURL);\r
         }\r
@@ -1088,10 +1105,10 @@ UINT CLogDlg::LogThread()
            // in case we got a merge path set, retrieve the merge info\r
            // of that path and check whether one of the merge URLs\r
            // match the URL we show the log for.\r
-           SVNPool localpool(pool);\r
-           svn_error_clear(Err);\r
+           GitPool localpool(pool);\r
+           git_error_clear(Err);\r
            apr_hash_t * mergeinfo = NULL;\r
-           if (svn_client_mergeinfo_get_merged (&mergeinfo, m_mergePath.GetSVNApiPath(localpool), SVNRev(SVNRev::REV_WC), m_pctx, localpool) == NULL)\r
+           if (git_client_mergeinfo_get_merged (&mergeinfo, m_mergePath.GetGitApiPath(localpool), GitRev(GitRev::REV_WC), m_pctx, localpool) == NULL)\r
            {\r
                    // now check the relative paths\r
                    apr_hash_index_t *hi;\r
@@ -1110,10 +1127,10 @@ UINT CLogDlg::LogThread()
                                            {\r
                                                    for (long i=0; i<arr->nelts; ++i)\r
                                                    {\r
-                                                           svn_merge_range_t * pRange = APR_ARRAY_IDX(arr, i, svn_merge_range_t*);\r
+                                                           git_merge_range_t * pRange = APR_ARRAY_IDX(arr, i, git_merge_range_t*);\r
                                                            if (pRange)\r
                                                            {\r
-                                                                   for (svn_revnum_t r=pRange->start+1; r<=pRange->end; ++r)\r
+                                                                   for (git_revnum_t r=pRange->start+1; r<=pRange->end; ++r)\r
                                                                    {\r
                                                                            m_mergedRevs.insert(r);\r
                                                                    }\r
@@ -1128,11 +1145,11 @@ UINT CLogDlg::LogThread()
     }\r
 \r
     m_LogProgress.SetPos(1);\r
-    if (m_startrev == SVNRev::REV_HEAD)\r
+    if (m_startrev == GitRev::REV_HEAD)\r
     {\r
            m_startrev = r;\r
     }\r
-    if (m_endrev == SVNRev::REV_HEAD)\r
+    if (m_endrev == GitRev::REV_HEAD)\r
     {\r
            m_endrev = r;\r
     }\r
@@ -1153,12 +1170,12 @@ UINT CLogDlg::LogThread()
 \r
     if (succeeded)\r
     {\r
-        succeeded = ReceiveLog (CTSVNPathList(m_path), m_pegrev, m_startrev, m_endrev, m_limit, m_bStrict, m_bIncludeMerges, refresh);\r
+        succeeded = ReceiveLog (CTGitPathList(m_path), m_pegrev, m_startrev, m_endrev, m_limit, m_bStrict, m_bIncludeMerges, refresh);\r
         if ((!succeeded)&&(!m_path.IsUrl()))\r
         {\r
                // try again with REV_WC as the start revision, just in case the path doesn't\r
                // exist anymore in HEAD\r
-               succeeded = ReceiveLog(CTSVNPathList(m_path), SVNRev(), SVNRev::REV_WC, m_endrev, m_limit, m_bStrict, m_bIncludeMerges, refresh);\r
+               succeeded = ReceiveLog(CTGitPathList(m_path), GitRev(), GitRev::REV_WC, m_endrev, m_limit, m_bStrict, m_bIncludeMerges, refresh);\r
         }\r
     }\r
        m_LogList.ClearText();\r
@@ -1171,12 +1188,12 @@ UINT CLogDlg::LogThread()
                if (!m_wcRev.IsValid())\r
                {\r
                        // fetch the revision the wc path is on so we can mark it\r
-                       CTSVNPath revWCPath = m_ProjectProperties.GetPropsPath();\r
+                       CTGitPath revWCPath = m_ProjectProperties.GetPropsPath();\r
                        if (!m_path.IsUrl())\r
                                revWCPath = m_path;\r
-                       if (DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\RecursiveLogRev"), FALSE)))\r
+                       if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RecursiveLogRev"), FALSE)))\r
                        {\r
-                               svn_revnum_t minrev, maxrev;\r
+                               git_revnum_t minrev, maxrev;\r
                                bool switched, modified, sparse;\r
                                GetWCRevisionStatus(revWCPath, true, minrev, maxrev, switched, modified, sparse);\r
                                if (maxrev)\r
@@ -1184,12 +1201,12 @@ UINT CLogDlg::LogThread()
                        }\r
                        else\r
                        {\r
-                               CTSVNPath dummypath;\r
-                               SVNStatus status;\r
-                               svn_wc_status2_t * stat = status.GetFirstFileStatus(revWCPath, dummypath, false, svn_depth_empty);\r
+                               CTGitPath dummypath;\r
+                               GitStatus status;\r
+                               git_wc_status2_t * stat = status.GetFirstFileStatus(revWCPath, dummypath, false, git_depth_empty);\r
                                if (stat && stat->entry && stat->entry->cmt_rev)\r
                                        m_wcRev = stat->entry->cmt_rev;\r
-                               if (stat && stat->entry && (stat->entry->kind == svn_node_dir))\r
+                               if (stat && stat->entry && (stat->entry->kind == git_node_dir))\r
                                        m_wcRev = stat->entry->revision;\r
                        }\r
                }\r
@@ -1250,11 +1267,13 @@ UINT CLogDlg::LogThread()
        // make sure the filter is applied (if any) now, after we refreshed/fetched\r
        // the log messages\r
        PostMessage(WM_TIMER, LOGFILTER_TIMER);\r
+#endif\r
        return 0;\r
 }\r
 \r
 void CLogDlg::CopySelectionToClipBoard()\r
 {\r
+#if 0\r
        CString sClipdata;\r
        POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
        if (pos != NULL)\r
@@ -1300,10 +1319,12 @@ void CLogDlg::CopySelectionToClipBoard()
                }\r
                CStringUtils::WriteAsciiStringToClipboard(sClipdata, GetSafeHwnd());\r
        }\r
+#endif\r
 }\r
 \r
 void CLogDlg::CopyChangedSelectionToClipBoard()\r
 {\r
+#if 0\r
        POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
        if (pos == NULL)\r
                return; // nothing is selected, get out of here\r
@@ -1317,7 +1338,7 @@ void CLogDlg::CopyChangedSelectionToClipBoard()
                while (pos)\r
                {\r
                        int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
-                       sPaths += m_currentChangedPathList[nItem].GetSVNPathString();\r
+                       sPaths += m_currentChangedPathList[nItem].GetGitPathString();\r
                        sPaths += _T("\r\n");\r
                }\r
        }\r
@@ -1355,10 +1376,12 @@ void CLogDlg::CopyChangedSelectionToClipBoard()
        }\r
        sPaths.Trim();\r
        CStringUtils::WriteAsciiStringToClipboard(sPaths, GetSafeHwnd());\r
+#endif\r
 }\r
 \r
-BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, svn_revnum_t rev)\r
+BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev)\r
 {\r
+#if 0\r
        CString added, deleted;\r
        if (changedpath == NULL)\r
                return false;\r
@@ -1372,6 +1395,7 @@ BOOL CLogDlg::IsDiffPossible(LogChangedPath * changedpath, svn_revnum_t rev)
                }\r
                return TRUE;\r
        }\r
+#endif\r
        return FALSE;\r
 }\r
 \r
@@ -1466,6 +1490,7 @@ bool CLogDlg::IsSelectionContinuous()
 \r
 LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)\r
 {\r
+#if 0\r
     ASSERT(m_pFindDialog != NULL);\r
 \r
     if (m_pFindDialog->IsTerminating())\r
@@ -1594,11 +1619,13 @@ LRESULT CLogDlg::OnFindDialogMessage(WPARAM /*wParam*/, LPARAM /*lParam*/)
                }\r
     } // if(m_pFindDialog->FindNext()) \r
        UpdateLogInfoLabel();\r
+#endif\r
     return 0;\r
 }\r
 \r
 void CLogDlg::OnOK()\r
 {\r
+#if 0 \r
        // since the log dialog is also used to select revisions for other\r
        // dialogs, we have to do some work before closing this dialog\r
        if (GetFocus() != GetDlgItem(IDOK))\r
@@ -1624,12 +1651,12 @@ void CLogDlg::OnOK()
                        POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
                        pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
                        m_selectedRevs.AddRevision(pLogEntry->Rev);\r
-                       svn_revnum_t lowerRev = pLogEntry->Rev;\r
-                       svn_revnum_t higherRev = lowerRev;\r
+                       git_revnum_t lowerRev = pLogEntry->Rev;\r
+                       git_revnum_t higherRev = lowerRev;\r
                        while (pos)\r
                        {\r
                            pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
-                               svn_revnum_t rev = pLogEntry->Rev;\r
+                               git_revnum_t rev = pLogEntry->Rev;\r
                                m_selectedRevs.AddRevision(pLogEntry->Rev);\r
                                if (lowerRev > rev)\r
                                        lowerRev = rev;\r
@@ -1648,7 +1675,7 @@ void CLogDlg::OnOK()
                                // if it was copied, use the copy from revision as lowerRev\r
                                if ((pLogEntry)&&(pLogEntry->pArChangedPaths)&&(lowerRev == higherRev))\r
                                {\r
-                                       CString sUrl = m_path.GetSVNPathString();\r
+                                       CString sUrl = m_path.GetGitPathString();\r
                                        if (!m_path.IsUrl())\r
                                        {\r
                                                sUrl = GetURLFromPath(m_path);\r
@@ -1687,9 +1714,10 @@ void CLogDlg::OnOK()
        UpdateData();\r
        if (m_bSaveStrict)\r
                m_regLastStrict = m_bStrict;\r
-       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\ShowAllEntry"));\r
+       CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\ShowAllEntry"));\r
        reg = m_btnShow.GetCurrentEntry();\r
        SaveSplitterPos();\r
+#endif \r
 }\r
 \r
 void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r
@@ -1702,6 +1730,7 @@ void CLogDlg::OnNMDblclkChangedFileList(NMHDR * /*pNMHDR*/, LRESULT *pResult)
 \r
 void CLogDlg::DiffSelectedFile()\r
 {\r
+#if 0\r
        if (m_bThreadRunning)\r
                return;\r
        UpdateLogInfoLabel();\r
@@ -1713,8 +1742,8 @@ void CLogDlg::DiffSelectedFile()
        // find out if there's an entry selected in the log list\r
        POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
        PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
-       svn_revnum_t rev1 = pLogEntry->Rev;\r
-       svn_revnum_t rev2 = rev1;\r
+       git_revnum_t rev1 = pLogEntry->Rev;\r
+       git_revnum_t rev2 = rev1;\r
        if (pos)\r
        {\r
                while (pos)\r
@@ -1764,10 +1793,10 @@ void CLogDlg::DiffSelectedFile()
                        {\r
                                // if the path was modified but the parent path was 'added with history'\r
                                // then we have to use the copy from revision of the parent path\r
-                               CTSVNPath cpath = CTSVNPath(changedpath->sPath);\r
+                               CTGitPath cpath = CTGitPath(changedpath->sPath);\r
                                for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)\r
                                {\r
-                                       CTSVNPath p = CTSVNPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);\r
+                                       CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);\r
                                        if (p.IsAncestorOf(cpath))\r
                                        {\r
                                                if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())\r
@@ -1779,9 +1808,9 @@ void CLogDlg::DiffSelectedFile()
                }\r
                else \r
                {\r
-                       CTSVNPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTSVNPath(changedpath->sPath));\r
-                       CTSVNPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTSVNPath(changedpath->sPath));\r
-                       SVNRev r = rev1;\r
+                       CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));\r
+                       CTGitPath tempfile2 = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(changedpath->sPath));\r
+                       GitRev r = rev1;\r
                        // deleted files must be opened from the revision before the deletion\r
                        if (changedpath->action == LOGACTIONS_DELETED)\r
                                r = rev1-1;\r
@@ -1796,14 +1825,14 @@ void CLogDlg::DiffSelectedFile()
                        SetAndClearProgressInfo(&progDlg);\r
                        progDlg.ShowModeless(m_hWnd);\r
 \r
-                       if (!Cat(CTSVNPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))\r
+                       if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), r, r, tempfile))\r
                        {\r
                                m_bCancelled = false;\r
-                               if (!Cat(CTSVNPath(m_sRepositoryRoot + changedpath->sPath), SVNRev::REV_HEAD, r, tempfile))\r
+                               if (!Cat(CTGitPath(m_sRepositoryRoot + changedpath->sPath), GitRev::REV_HEAD, r, tempfile))\r
                                {\r
                                        progDlg.Stop();\r
                                        SetAndClearProgressInfo((HWND)NULL);\r
-                                       CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                       CMessageBox::Show(m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        return;\r
                                }\r
                        }\r
@@ -1811,8 +1840,8 @@ void CLogDlg::DiffSelectedFile()
                        SetAndClearProgressInfo((HWND)NULL);\r
 \r
                        CString sName1, sName2;\r
-                       sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (svn_revnum_t)rev1);\r
-                       sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (svn_revnum_t)rev1-1);\r
+                       sName1.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1);\r
+                       sName2.Format(_T("%s - Revision %ld"), (LPCTSTR)CPathUtils::GetFileNameFromPath(changedpath->sPath), (git_revnum_t)rev1-1);\r
                        CAppUtils::DiffFlags flags;\r
                        flags.AlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
                        if (changedpath->action == LOGACTIONS_DELETED)\r
@@ -1821,6 +1850,7 @@ void CLogDlg::DiffSelectedFile()
                                CAppUtils::StartExtDiff(tempfile2, tempfile, sName2, sName1, flags);\r
                }\r
        }\r
+#endif \r
 }\r
 \r
 \r
@@ -1829,12 +1859,13 @@ void CLogDlg::OnNMDblclkLoglist(NMHDR * /*pNMHDR*/, LRESULT *pResult)
        // a double click on an entry in the revision list has happened\r
        *pResult = 0;\r
 \r
-  if (CRegDWORD(_T("Software\\TortoiseSVN\\DiffByDoubleClickInLog"), FALSE))\r
+  if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))\r
          DiffSelectedRevWithPrevious();\r
 }\r
 \r
 void CLogDlg::DiffSelectedRevWithPrevious()\r
 {\r
+#if 0\r
        if (m_bThreadRunning)\r
                return;\r
        UpdateLogInfoLabel();\r
@@ -1850,7 +1881,7 @@ void CLogDlg::DiffSelectedRevWithPrevious()
        PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
        long rev1 = pLogEntry->Rev;\r
        long rev2 = rev1-1;\r
-       CTSVNPath path = m_path;\r
+       CTGitPath path = m_path;\r
 \r
        // See how many files under the relative root were changed in selected revision\r
        int nChanged = 0;\r
@@ -1879,30 +1910,32 @@ void CLogDlg::DiffSelectedRevWithPrevious()
 \r
        if (PromptShown())\r
        {\r
-               SVNDiff diff(this, m_hWnd, true);\r
+               GitDiff diff(this, m_hWnd, true);\r
                diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
                diff.SetHEADPeg(m_LogRevision);\r
                diff.ShowCompare(path, rev2, path, rev1);\r
        }\r
        else\r
        {\r
-               CAppUtils::StartShowCompare(m_hWnd, path, rev2, path, rev1, SVNRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
+               CAppUtils::StartShowCompare(m_hWnd, path, rev2, path, rev1, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
        }\r
 \r
        theApp.DoWaitCursor(-1);\r
        EnableOKButton();\r
+#endif\r
 }\r
 \r
-void CLogDlg::DoDiffFromLog(INT_PTR selIndex, svn_revnum_t rev1, svn_revnum_t rev2, bool blame, bool unified)\r
+void CLogDlg::DoDiffFromLog(INT_PTR selIndex, git_revnum_t rev1, git_revnum_t rev2, bool blame, bool unified)\r
 {\r
+#if 0\r
        DialogEnableWindow(IDOK, FALSE);\r
        SetPromptApp(&theApp);\r
        theApp.DoWaitCursor(1);\r
        //get the filename\r
        CString filepath;\r
-       if (SVN::PathIsURL(m_path))\r
+       if (Git::PathIsURL(m_path))\r
        {\r
-               filepath = m_path.GetSVNPathString();\r
+               filepath = m_path.GetGitPathString();\r
        }\r
        else\r
        {\r
@@ -1912,7 +1945,7 @@ void CLogDlg::DoDiffFromLog(INT_PTR selIndex, svn_revnum_t rev1, svn_revnum_t re
                        theApp.DoWaitCursor(-1);\r
                        CString temp;\r
                        temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
-                       CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                        TRACE(_T("could not retrieve the URL of the file!\n"));\r
                        EnableOKButton();\r
                        theApp.DoWaitCursor(-11);\r
@@ -1920,7 +1953,7 @@ void CLogDlg::DoDiffFromLog(INT_PTR selIndex, svn_revnum_t rev1, svn_revnum_t re
                }\r
        }\r
        m_bCancelled = FALSE;\r
-       filepath = GetRepositoryRoot(CTSVNPath(filepath));\r
+       filepath = GetRepositoryRoot(CTGitPath(filepath));\r
 \r
        CString firstfile, secondfile;\r
        if (m_LogList.GetSelectedCount()==1)\r
@@ -1938,47 +1971,49 @@ void CLogDlg::DoDiffFromLog(INT_PTR selIndex, svn_revnum_t rev1, svn_revnum_t re
        }\r
        else\r
        {\r
-               firstfile = m_currentChangedPathList[selIndex].GetSVNPathString();\r
+               firstfile = m_currentChangedPathList[selIndex].GetGitPathString();\r
                secondfile = firstfile;\r
        }\r
 \r
        firstfile = filepath + firstfile.Trim();\r
        secondfile = filepath + secondfile.Trim();\r
 \r
-       SVNDiff diff(this, this->m_hWnd, true);\r
+       GitDiff diff(this, this->m_hWnd, true);\r
        diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
        diff.SetHEADPeg(m_LogRevision);\r
        if (unified)\r
        {\r
                if (PromptShown())\r
-                       diff.ShowUnifiedDiff(CTSVNPath(secondfile), rev2, CTSVNPath(firstfile), rev1);\r
+                       diff.ShowUnifiedDiff(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1);\r
                else\r
-                       CAppUtils::StartShowUnifiedDiff(m_hWnd, CTSVNPath(secondfile), rev2, CTSVNPath(firstfile), rev1, SVNRev(), m_LogRevision);\r
+                       CAppUtils::StartShowUnifiedDiff(m_hWnd, CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), m_LogRevision);\r
        }\r
        else\r
        {\r
-               if (diff.ShowCompare(CTSVNPath(secondfile), rev2, CTSVNPath(firstfile), rev1, SVNRev(), false, blame))\r
+               if (diff.ShowCompare(CTGitPath(secondfile), rev2, CTGitPath(firstfile), rev1, GitRev(), false, blame))\r
                {\r
                        if (firstfile.Compare(secondfile)==0)\r
                        {\r
-                               svn_revnum_t baseRev = 0;\r
-                               diff.DiffProps(CTSVNPath(firstfile), rev2, rev1, baseRev);\r
+                               git_revnum_t baseRev = 0;\r
+                               diff.DiffProps(CTGitPath(firstfile), rev2, rev1, baseRev);\r
                        }\r
                }\r
        }\r
        theApp.DoWaitCursor(-1);\r
        EnableOKButton();\r
+#endif\r
 }\r
 \r
-BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, svn_revnum_t rev)\r
+BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, git_revnum_t rev)\r
 {\r
+#if 0\r
        DialogEnableWindow(IDOK, FALSE);\r
        SetPromptApp(&theApp);\r
        theApp.DoWaitCursor(1);\r
        CString filepath;\r
-       if (SVN::PathIsURL(m_path))\r
+       if (Git::PathIsURL(m_path))\r
        {\r
-               filepath = m_path.GetSVNPathString();\r
+               filepath = m_path.GetGitPathString();\r
        }\r
        else\r
        {\r
@@ -1988,32 +2023,32 @@ BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, svn_revnum_t rev)
                        theApp.DoWaitCursor(-1);\r
                        CString temp;\r
                        temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
-                       CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                        TRACE(_T("could not retrieve the URL of the file!\n"));\r
                        EnableOKButton();\r
                        return FALSE;\r
                }\r
        }\r
        m_bCancelled = false;\r
-       filepath = GetRepositoryRoot(CTSVNPath(filepath));\r
+       filepath = GetRepositoryRoot(CTGitPath(filepath));\r
        filepath += changedpath;\r
 \r
        CProgressDlg progDlg;\r
        progDlg.SetTitle(IDS_APPNAME);\r
        progDlg.SetAnimation(IDR_DOWNLOAD);\r
        CString sInfoLine;\r
-       sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)SVNRev(rev).ToString());\r
+       sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)GitRev(rev).ToString());\r
        progDlg.SetLine(1, sInfoLine, true);\r
        SetAndClearProgressInfo(&progDlg);\r
        progDlg.ShowModeless(m_hWnd);\r
 \r
-       CTSVNPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTSVNPath(filepath), rev);\r
+       CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, CTGitPath(filepath), rev);\r
        m_bCancelled = false;\r
-       if (!Cat(CTSVNPath(filepath), SVNRev(rev), rev, tempfile))\r
+       if (!Cat(CTGitPath(filepath), GitRev(rev), rev, tempfile))\r
        {\r
                progDlg.Stop();\r
                SetAndClearProgressInfo((HWND)NULL);\r
-               CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+               CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                EnableOKButton();\r
                theApp.DoWaitCursor(-1);\r
                return FALSE;\r
@@ -2035,11 +2070,13 @@ BOOL CLogDlg::Open(bool bOpenWith,CString changedpath, svn_revnum_t rev)
        }\r
        EnableOKButton();\r
        theApp.DoWaitCursor(-1);\r
+#endif\r
        return TRUE;\r
 }\r
 \r
 void CLogDlg::EditAuthor(const CLogDataVector& logs)\r
 {\r
+#if 0\r
        CString url;\r
        CString name;\r
        if (logs.size() == 0)\r
@@ -2047,15 +2084,15 @@ void CLogDlg::EditAuthor(const CLogDataVector& logs)
        DialogEnableWindow(IDOK, FALSE);\r
        SetPromptApp(&theApp);\r
        theApp.DoWaitCursor(1);\r
-       if (SVN::PathIsURL(m_path))\r
-               url = m_path.GetSVNPathString();\r
+       if (Git::PathIsURL(m_path))\r
+               url = m_path.GetGitPathString();\r
        else\r
        {\r
                url = GetURLFromPath(m_path);\r
        }\r
-       name = SVN_PROP_REVISION_AUTHOR;\r
+       name = Git_PROP_REVISION_AUTHOR;\r
 \r
-       CString value = RevPropertyGet(name, CTSVNPath(url), logs[0]->Rev);\r
+       CString value = RevPropertyGet(name, CTGitPath(url), logs[0]->Rev);\r
        CString sOldValue = value;\r
        value.Replace(_T("\n"), _T("\r\n"));\r
        CInputDlg dlg(this);\r
@@ -2069,7 +2106,7 @@ void CLogDlg::EditAuthor(const CLogDataVector& logs)
                dlg.m_sInputText.Replace(_T("\r"), _T(""));\r
 \r
                LogCache::CCachedLogInfo* toUpdate \r
-                       = GetLogCache (CTSVNPath (m_sRepositoryRoot));\r
+                       = GetLogCache (CTGitPath (m_sRepositoryRoot));\r
 \r
                CProgressDlg progDlg;\r
                progDlg.SetTitle(IDS_APPNAME);\r
@@ -2079,10 +2116,10 @@ void CLogDlg::EditAuthor(const CLogDataVector& logs)
                progDlg.ShowModeless(m_hWnd);\r
                for (DWORD i=0; i<logs.size(); ++i)\r
                {\r
-                       if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTSVNPath(url), logs[i]->Rev))\r
+                       if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), logs[i]->Rev))\r
                        {\r
                                progDlg.Stop();\r
-                               CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                               CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                break;\r
                        }\r
                        else\r
@@ -2113,26 +2150,28 @@ void CLogDlg::EditAuthor(const CLogDataVector& logs)
        }\r
        theApp.DoWaitCursor(-1);\r
        EnableOKButton();\r
+#endif\r
 }\r
 \r
 void CLogDlg::EditLogMessage(int index)\r
 {\r
+#if 0\r
        CString url;\r
        CString name;\r
        DialogEnableWindow(IDOK, FALSE);\r
        SetPromptApp(&theApp);\r
        theApp.DoWaitCursor(1);\r
-       if (SVN::PathIsURL(m_path))\r
-               url = m_path.GetSVNPathString();\r
+       if (Git::PathIsURL(m_path))\r
+               url = m_path.GetGitPathString();\r
        else\r
        {\r
                url = GetURLFromPath(m_path);\r
        }\r
-       name = SVN_PROP_REVISION_LOG;\r
+       name = Git_PROP_REVISION_LOG;\r
 \r
        PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(index));\r
        m_bCancelled = FALSE;\r
-       CString value = RevPropertyGet(name, CTSVNPath(url), pLogEntry->Rev);\r
+       CString value = RevPropertyGet(name, CTGitPath(url), pLogEntry->Rev);\r
        CString sOldValue = value;\r
        value.Replace(_T("\n"), _T("\r\n"));\r
        CInputDlg dlg(this);\r
@@ -2144,9 +2183,9 @@ void CLogDlg::EditLogMessage(int index)
        if (dlg.DoModal() == IDOK)\r
        {\r
                dlg.m_sInputText.Replace(_T("\r"), _T(""));\r
-               if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTSVNPath(url), pLogEntry->Rev))\r
+               if (!RevPropertySet(name, dlg.m_sInputText, sOldValue, CTGitPath(url), pLogEntry->Rev))\r
                {\r
-                       CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                       CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                }\r
                else\r
                {\r
@@ -2175,7 +2214,7 @@ void CLogDlg::EditLogMessage(int index)
             // update the log cache \r
 \r
             LogCache::CCachedLogInfo* toUpdate \r
-                = GetLogCache (CTSVNPath (m_sRepositoryRoot));\r
+                = GetLogCache (CTGitPath (m_sRepositoryRoot));\r
             if (toUpdate != NULL)\r
             {\r
                 // log caching is active\r
@@ -2193,6 +2232,7 @@ void CLogDlg::EditLogMessage(int index)
        }\r
        theApp.DoWaitCursor(-1);\r
        EnableOKButton();\r
+#endif\r
 }\r
 \r
 BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)\r
@@ -2203,7 +2243,7 @@ BOOL CLogDlg::PreTranslateMessage(MSG* pMsg)
        {\r
                if (GetFocus()==GetDlgItem(IDC_LOGLIST))\r
                {\r
-                       if (CRegDWORD(_T("Software\\TortoiseSVN\\DiffByDoubleClickInLog"), FALSE))\r
+                       if (CRegDWORD(_T("Software\\TortoiseGit\\DiffByDoubleClickInLog"), FALSE))\r
                        {\r
                                DiffSelectedRevWithPrevious();\r
                                return TRUE;\r
@@ -2314,6 +2354,7 @@ void CLogDlg::OnEnLinkMsgview(NMHDR *pNMHDR, LRESULT *pResult)
 \r
 void CLogDlg::OnBnClickedStatbutton()\r
 {\r
+#if 0\r
        if (m_bThreadRunning)\r
                return;\r
        if (m_arShownList.IsEmpty())\r
@@ -2347,10 +2388,12 @@ void CLogDlg::OnBnClickedStatbutton()
        // restore the previous sorting\r
        SortByColumn(m_nSortColumn, m_bAscending);\r
        OnTimer(LOGFILTER_TIMER);\r
+#endif\r
 }\r
 \r
 void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)\r
 {\r
+#if 0\r
        NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );\r
        // Take the default processing unless we set this to something else below.\r
        *pResult = CDRF_DODEFAULT;\r
@@ -2526,9 +2569,11 @@ void CLogDlg::OnNMCustomdrawLoglist(NMHDR *pNMHDR, LRESULT *pResult)
                break;\r
        }\r
        *pResult = CDRF_DODEFAULT;\r
+#endif\r
 }\r
 void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)\r
 {\r
+#if 0\r
        NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );\r
        // Take the default processing unless we set this to something else below.\r
        *pResult = CDRF_DODEFAULT;\r
@@ -2566,7 +2611,7 @@ void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
                        }\r
                        else if (m_currentChangedPathList.GetCount() > (INT_PTR)pLVCD->nmcd.dwItemSpec)\r
                        {\r
-                               if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetSVNPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)\r
+                               if (m_currentChangedPathList[pLVCD->nmcd.dwItemSpec].GetGitPathString().Left(m_sRelativeRoot.GetLength()).Compare(m_sRelativeRoot)!=0)\r
                                {\r
                                        crText = GetSysColor(COLOR_GRAYTEXT);\r
                                        bGrayed = true;\r
@@ -2590,10 +2635,12 @@ void CLogDlg::OnNMCustomdrawChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
                // Store the color back in the NMLVCUSTOMDRAW struct.\r
                pLVCD->clrText = crText;\r
        }\r
+#endif\r
 }\r
 \r
 void CLogDlg::DoSizeV1(int delta)\r
 {\r
+\r
        RemoveAnchor(IDC_LOGLIST);\r
        RemoveAnchor(IDC_SPLITTERTOP);\r
        RemoveAnchor(IDC_MSGVIEW);\r
@@ -2611,10 +2658,12 @@ void CLogDlg::DoSizeV1(int delta)
        SetSplitterRange();\r
        m_LogList.Invalidate();\r
        GetDlgItem(IDC_MSGVIEW)->Invalidate();\r
+\r
 }\r
 \r
 void CLogDlg::DoSizeV2(int delta)\r
 {\r
+\r
        RemoveAnchor(IDC_LOGLIST);\r
        RemoveAnchor(IDC_SPLITTERTOP);\r
        RemoveAnchor(IDC_MSGVIEW);\r
@@ -2632,6 +2681,7 @@ void CLogDlg::DoSizeV2(int delta)
        SetSplitterRange();\r
        GetDlgItem(IDC_MSGVIEW)->Invalidate();\r
        m_ChangedFileListCtrl.Invalidate();\r
+\r
 }\r
 \r
 void CLogDlg::AdjustMinSize()\r
@@ -2725,7 +2775,7 @@ LRESULT CLogDlg::OnClickedInfoIcon(WPARAM /*wParam*/, LPARAM lParam)
                        if (selection == LOGFILTER_REGEX)\r
                        {\r
                                m_bFilterWithRegex = !m_bFilterWithRegex;\r
-                               CRegDWORD b = CRegDWORD(_T("Software\\TortoiseSVN\\UseRegexFilter"), TRUE);\r
+                               CRegDWORD b = CRegDWORD(_T("Software\\TortoiseGit\\UseRegexFilter"), TRUE);\r
                                b = m_bFilterWithRegex;\r
                                CheckRegexpTooltip();\r
                        }\r
@@ -2899,6 +2949,7 @@ void CLogDlg::OnLvnGetdispinfoLoglist(NMHDR *pNMHDR, LRESULT *pResult)
 \r
 void CLogDlg::OnLvnGetdispinfoChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)\r
 {\r
+#if 0\r
        NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);\r
 \r
        //Create a pointer to the item\r
@@ -2942,7 +2993,7 @@ void CLogDlg::OnLvnGetdispinfoChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
                        if (lcpath)\r
                                lstrcpyn(pItem->pszText, (LPCTSTR)lcpath->sPath, pItem->cchTextMax);\r
                        else\r
-                               lstrcpyn(pItem->pszText, (LPCTSTR)m_currentChangedPathList[pItem->iItem].GetSVNPathString(), pItem->cchTextMax);\r
+                               lstrcpyn(pItem->pszText, (LPCTSTR)m_currentChangedPathList[pItem->iItem].GetGitPathString(), pItem->cchTextMax);\r
                        break;\r
                case 2: //copyfrom path\r
                        if (lcpath)\r
@@ -2960,6 +3011,7 @@ void CLogDlg::OnLvnGetdispinfoChangedFileList(NMHDR *pNMHDR, LRESULT *pResult)
        }\r
 \r
        *pResult = 0;\r
+#endif\r
 }\r
 \r
 void CLogDlg::OnEnChangeSearchedit()\r
@@ -3023,6 +3075,7 @@ bool CLogDlg::Validate(LPCTSTR string)
 \r
 void CLogDlg::RecalculateShownList(CPtrArray * pShownlist)\r
 {\r
+#if 0\r
        pShownlist->RemoveAll();\r
        tr1::wregex pat;//(_T("Remove"), tr1::regex_constants::icase);\r
        bool bRegex = false;\r
@@ -3182,7 +3235,7 @@ void CLogDlg::RecalculateShownList(CPtrArray * pShownlist)
                        }\r
                } // else (from if (bRegex))    \r
        } // for (DWORD i=0; i<m_logEntries.size(); ++i) \r
-\r
+#endif\r
 }\r
 \r
 void CLogDlg::OnTimer(UINT_PTR nIDEvent)\r
@@ -3288,9 +3341,11 @@ BOOL CLogDlg::IsEntryInDateRange(int i)
        return FALSE;\r
 }\r
 \r
-CTSVNPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)\r
+CTGitPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths /* = false */, bool bUseFilter /* = true */)\r
 {\r
-       CTSVNPathList pathList;\r
+       CTGitPathList pathList;\r
+#if 0\r
+       \r
        if (m_sRepositoryRoot.IsEmpty() && (bRelativePaths == false))\r
        {\r
                m_sRepositoryRoot = GetRepositoryRoot(m_path);\r
@@ -3313,9 +3368,9 @@ CTSVNPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths
                                LogChangedPath * cpath = cpatharray->GetAt(cpPathIndex);\r
                                if (cpath == NULL)\r
                                        continue;\r
-                               CTSVNPath path;\r
+                               CTGitPath path;\r
                                if (!bRelativePaths)\r
-                                       path.SetFromSVN(m_sRepositoryRoot);\r
+                                       path.SetFromGit(m_sRepositoryRoot);\r
                                path.AppendPathString(cpath->sPath);\r
                                if ((!bUseFilter)||\r
                                        ((m_cHidePaths.GetState() & 0x0003)!=BST_CHECKED)||\r
@@ -3326,6 +3381,7 @@ CTSVNPathList CLogDlg::GetChangedPathsFromSelectedRevisions(bool bRelativePaths
                }\r
        }\r
        pathList.RemoveDuplicates();\r
+#endif\r
        return pathList;\r
 }\r
 \r
@@ -3471,6 +3527,7 @@ bool CLogDlg::m_bAscendingPathList = false;
 \r
 int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)\r
 {\r
+#if 0\r
        LogChangedPath * cpath1 = *((LogChangedPath**)pElem1);\r
        LogChangedPath * cpath2 = *((LogChangedPath**)pElem2);\r
 \r
@@ -3498,11 +3555,13 @@ int CLogDlg::SortCompare(const void * pElem1, const void * pElem2)
        case 3: // copy from revision\r
                        return cpath2->lCopyFromRev > cpath1->lCopyFromRev;\r
        }\r
+#endif\r
        return 0;\r
 }\r
 \r
 void CLogDlg::ResizeAllListCtrlCols()\r
 {\r
+#if 0\r
        const int nMinimumWidth = ICONITEMBORDER+16*4;\r
        int maxcol = ((CHeaderCtrl*)(m_LogList.GetDlgItem(0)))->GetItemCount()-1;\r
        int nItemCount = m_LogList.GetItemCount();\r
@@ -3570,6 +3629,7 @@ void CLogDlg::ResizeAllListCtrlCols()
                        m_LogList.SetColumnWidth(col, cx);\r
                }\r
        }\r
+#endif\r
 }\r
 \r
 void CLogDlg::OnBnClickedHidepaths()\r
@@ -3644,6 +3704,7 @@ void CLogDlg::OnLvnOdfinditemLoglist(NMHDR *pNMHDR, LRESULT *pResult)
 \r
 void CLogDlg::OnBnClickedCheckStoponcopy()\r
 {\r
+#if 0\r
        if (!GetDlgItem(IDC_GETALL)->IsWindowEnabled())\r
                return;\r
 \r
@@ -3656,22 +3717,24 @@ void CLogDlg::OnBnClickedCheckStoponcopy()
        m_endrev = 0;\r
 \r
        // now, restart the query\r
-\r
+#endif\r
        Refresh();\r
 }\r
 \r
 void CLogDlg::OnBnClickedIncludemerge()\r
 {\r
+#if 0\r
        m_endrev = 0;\r
 \r
        m_limit = 0;\r
+#endif\r
        Refresh();\r
 }\r
 \r
 void CLogDlg::UpdateLogInfoLabel()\r
 {\r
-       svn_revnum_t rev1 = 0;\r
-       svn_revnum_t rev2 = 0;\r
+       git_revnum_t rev1 = 0;\r
+       git_revnum_t rev2 = 0;\r
        long selectedrevs = 0;\r
        if (m_arShownList.GetCount())\r
        {\r
@@ -3689,6 +3752,7 @@ void CLogDlg::UpdateLogInfoLabel()
 \r
 void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)\r
 {\r
+#if 0\r
        int selIndex = m_LogList.GetSelectionMark();\r
        if (selIndex < 0)\r
                return; // nothing selected, nothing to do with a context menu\r
@@ -3717,8 +3781,8 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
        if (indexNext < 0)\r
                return;\r
        PLOGENTRYDATA pSelLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(indexNext));\r
-       SVNRev revSelected = pSelLogEntry->Rev;\r
-       SVNRev revPrevious = svn_revnum_t(revSelected)-1;\r
+       GitRev revSelected = pSelLogEntry->Rev;\r
+       GitRev revPrevious = git_revnum_t(revSelected)-1;\r
        if ((pSelLogEntry->pArChangedPaths)&&(pSelLogEntry->pArChangedPaths->GetCount() <= 2))\r
        {\r
                for (int i=0; i<pSelLogEntry->pArChangedPaths->GetCount(); ++i)\r
@@ -3728,7 +3792,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                revPrevious = changedpath->lCopyFromRev;\r
                }\r
        }\r
-       SVNRev revSelected2;\r
+       GitRev revSelected2;\r
        if (pos)\r
        {\r
                PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
@@ -3737,8 +3801,8 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
        bool bAllFromTheSameAuthor = true;\r
        CString firstAuthor;\r
        CLogDataVector selEntries;\r
-       SVNRev revLowest, revHighest;\r
-       SVNRevRangeArray revisionRanges;\r
+       GitRev revLowest, revHighest;\r
+       GitRevRangeArray revisionRanges;\r
        {\r
                POSITION pos = m_LogList.GetFirstSelectedItemPosition();\r
                PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
@@ -3754,8 +3818,8 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                        selEntries.push_back(pLogEntry);\r
                        if (firstAuthor.Compare(pLogEntry->sAuthor))\r
                                bAllFromTheSameAuthor = false;\r
-                       revLowest = (svn_revnum_t(pLogEntry->Rev) > svn_revnum_t(revLowest) ? revLowest : pLogEntry->Rev);\r
-                       revHighest = (svn_revnum_t(pLogEntry->Rev) < svn_revnum_t(revHighest) ? revHighest : pLogEntry->Rev);\r
+                       revLowest = (git_revnum_t(pLogEntry->Rev) > git_revnum_t(revLowest) ? revLowest : pLogEntry->Rev);\r
+                       revHighest = (git_revnum_t(pLogEntry->Rev) < git_revnum_t(revHighest) ? revHighest : pLogEntry->Rev);\r
                }\r
        }\r
 \r
@@ -3880,24 +3944,24 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                        {\r
                                if (PromptShown())\r
                                {\r
-                                       SVNDiff diff(this, this->m_hWnd, true);\r
+                                       GitDiff diff(this, this->m_hWnd, true);\r
                                        diff.SetHEADPeg(m_LogRevision);\r
                                        diff.ShowUnifiedDiff(m_path, revPrevious, m_path, revSelected);\r
                                }\r
                                else\r
-                                       CAppUtils::StartShowUnifiedDiff(m_hWnd, m_path, revPrevious, m_path, revSelected, SVNRev(), m_LogRevision);\r
+                                       CAppUtils::StartShowUnifiedDiff(m_hWnd, m_path, revPrevious, m_path, revSelected, GitRev(), m_LogRevision);\r
                        }\r
                        break;\r
                case ID_GNUDIFF2:\r
                        {\r
                                if (PromptShown())\r
                                {\r
-                                       SVNDiff diff(this, this->m_hWnd, true);\r
+                                       GitDiff diff(this, this->m_hWnd, true);\r
                                        diff.SetHEADPeg(m_LogRevision);\r
                                        diff.ShowUnifiedDiff(m_path, revSelected2, m_path, revSelected);\r
                                }\r
                                else\r
-                                       CAppUtils::StartShowUnifiedDiff(m_hWnd, m_path, revSelected2, m_path, revSelected, SVNRev(), m_LogRevision);\r
+                                       CAppUtils::StartShowUnifiedDiff(m_hWnd, m_path, revSelected2, m_path, revSelected, GitRev(), m_LogRevision);\r
                        }\r
                        break;\r
                case ID_REVERTREV:\r
@@ -3907,17 +3971,17 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                {\r
                                        CString strMessage;\r
                                        strMessage.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)(m_path.GetUIPathString()));\r
-                                       CMessageBox::Show(this->m_hWnd, strMessage, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                       CMessageBox::Show(this->m_hWnd, strMessage, _T("TortoiseGit"), MB_ICONERROR);\r
                                        TRACE(_T("could not retrieve the URL of the folder!\n"));\r
                                        break;          //exit\r
                                }\r
                                CString msg;\r
                                msg.Format(IDS_LOG_REVERT_CONFIRM, m_path.GetWinPath());\r
-                               if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION) == IDYES)\r
+                               if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)\r
                                {\r
-                                       CSVNProgressDlg dlg;\r
-                                       dlg.SetCommand(CSVNProgressDlg::SVNProgress_Merge);\r
-                                       dlg.SetPathList(CTSVNPathList(m_path));\r
+                                       CGitProgressDlg dlg;\r
+                                       dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);\r
+                                       dlg.SetPathList(CTGitPathList(m_path));\r
                                        dlg.SetUrl(pathURL);\r
                                        dlg.SetSecondUrl(pathURL);\r
                                        revisionRanges.AdjustForMerge(true);\r
@@ -3934,7 +3998,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                {\r
                                        CString strMessage;\r
                                        strMessage.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)(m_path.GetUIPathString()));\r
-                                       CMessageBox::Show(this->m_hWnd, strMessage, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                       CMessageBox::Show(this->m_hWnd, strMessage, _T("TortoiseGit"), MB_ICONERROR);\r
                                        TRACE(_T("could not retrieve the URL of the folder!\n"));\r
                                        break;          //exit\r
                                }\r
@@ -3953,9 +4017,9 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                }\r
                                if (bGotSavePath)\r
                                {\r
-                                       CSVNProgressDlg dlg;\r
-                                       dlg.SetCommand(CSVNProgressDlg::SVNProgress_Merge);\r
-                                       dlg.SetPathList(CTSVNPathList(CTSVNPath(path)));\r
+                                       CGitProgressDlg dlg;\r
+                                       dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);\r
+                                       dlg.SetPathList(CTGitPathList(CTGitPath(path)));\r
                                        dlg.SetUrl(pathURL);\r
                                        dlg.SetSecondUrl(pathURL);\r
                                        revisionRanges.AdjustForMerge(false);\r
@@ -3972,22 +4036,22 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                {\r
                                        CString strMessage;\r
                                        strMessage.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)(m_path.GetUIPathString()));\r
-                                       CMessageBox::Show(this->m_hWnd, strMessage, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                       CMessageBox::Show(this->m_hWnd, strMessage, _T("TortoiseGit"), MB_ICONERROR);\r
                                        TRACE(_T("could not retrieve the URL of the folder!\n"));\r
                                        break;          //exit\r
                                }\r
 \r
                                CString msg;\r
                                msg.Format(IDS_LOG_REVERTTOREV_CONFIRM, m_path.GetWinPath());\r
-                               if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION) == IDYES)\r
+                               if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)\r
                                {\r
-                                       CSVNProgressDlg dlg;\r
-                                       dlg.SetCommand(CSVNProgressDlg::SVNProgress_Merge);\r
-                                       dlg.SetPathList(CTSVNPathList(m_path));\r
+                                       CGitProgressDlg dlg;\r
+                                       dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);\r
+                                       dlg.SetPathList(CTGitPathList(m_path));\r
                                        dlg.SetUrl(pathURL);\r
                                        dlg.SetSecondUrl(pathURL);\r
-                                       SVNRevRangeArray revarray;\r
-                                       revarray.AddRevRange(SVNRev::REV_HEAD, revSelected);\r
+                                       GitRevRangeArray revarray;\r
+                                       revarray.AddRevRange(GitRev::REV_HEAD, revSelected);\r
                                        dlg.SetRevisionRanges(revarray);\r
                                        dlg.SetPegRevision(m_LogRevision);\r
                                        dlg.DoModal();\r
@@ -4001,7 +4065,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                {\r
                                        CString strMessage;\r
                                        strMessage.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)(m_path.GetUIPathString()));\r
-                                       CMessageBox::Show(this->m_hWnd, strMessage, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                       CMessageBox::Show(this->m_hWnd, strMessage, _T("TortoiseGit"), MB_ICONERROR);\r
                                        TRACE(_T("could not retrieve the URL of the folder!\n"));\r
                                        break;          //exit\r
                                }\r
@@ -4014,8 +4078,8 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                {\r
                                        // should we show a progress dialog here? Copies are done really fast\r
                                        // and without much network traffic.\r
-                                       if (!Copy(CTSVNPathList(CTSVNPath(pathURL)), CTSVNPath(dlg.m_URL), dlg.m_CopyRev, dlg.m_CopyRev, dlg.m_sLogMessage))\r
-                                               CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                       if (!Copy(CTGitPathList(CTGitPath(pathURL)), CTGitPath(dlg.m_URL), dlg.m_CopyRev, dlg.m_CopyRev, dlg.m_sLogMessage))\r
+                                               CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        else\r
                                                CMessageBox::Show(this->m_hWnd, IDS_LOG_COPY_SUCCESS, IDS_APPNAME, MB_ICONINFORMATION);\r
                                }\r
@@ -4026,19 +4090,19 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                //user clicked on the menu item "compare with working copy"\r
                                if (PromptShown())\r
                                {\r
-                                       SVNDiff diff(this, m_hWnd, true);\r
+                                       GitDiff diff(this, m_hWnd, true);\r
                                        diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
                                        diff.SetHEADPeg(m_LogRevision);\r
-                                       diff.ShowCompare(m_path, SVNRev::REV_WC, m_path, revSelected);\r
+                                       diff.ShowCompare(m_path, GitRev::REV_WC, m_path, revSelected);\r
                                }\r
                                else\r
-                                       CAppUtils::StartShowCompare(m_hWnd, m_path, SVNRev::REV_WC, m_path, revSelected, SVNRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
+                                       CAppUtils::StartShowCompare(m_hWnd, m_path, GitRev::REV_WC, m_path, revSelected, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
                        }\r
                        break;\r
                case ID_COMPARETWO:\r
                        {\r
-                               SVNRev r1 = revSelected;\r
-                               SVNRev r2 = revSelected2;\r
+                               GitRev r1 = revSelected;\r
+                               GitRev r2 = revSelected2;\r
                                if (m_LogList.GetSelectedCount() > 2)\r
                                {\r
                                        r1 = revHighest;\r
@@ -4047,26 +4111,26 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                //user clicked on the menu item "compare revisions"\r
                                if (PromptShown())\r
                                {\r
-                                       SVNDiff diff(this, m_hWnd, true);\r
+                                       GitDiff diff(this, m_hWnd, true);\r
                                        diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
                                        diff.SetHEADPeg(m_LogRevision);\r
-                                       diff.ShowCompare(CTSVNPath(pathURL), r2, CTSVNPath(pathURL), r1);\r
+                                       diff.ShowCompare(CTGitPath(pathURL), r2, CTGitPath(pathURL), r1);\r
                                }\r
                                else\r
-                                       CAppUtils::StartShowCompare(m_hWnd, CTSVNPath(pathURL), r2, CTSVNPath(pathURL), r1, SVNRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
+                                       CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), r2, CTGitPath(pathURL), r1, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
                        }\r
                        break;\r
                case ID_COMPAREWITHPREVIOUS:\r
                        {\r
                                if (PromptShown())\r
                                {\r
-                                       SVNDiff diff(this, m_hWnd, true);\r
+                                       GitDiff diff(this, m_hWnd, true);\r
                                        diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
                                        diff.SetHEADPeg(m_LogRevision);\r
-                                       diff.ShowCompare(CTSVNPath(pathURL), revPrevious, CTSVNPath(pathURL), revSelected);\r
+                                       diff.ShowCompare(CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected);\r
                                }\r
                                else\r
-                                       CAppUtils::StartShowCompare(m_hWnd, CTSVNPath(pathURL), revPrevious, CTSVNPath(pathURL), revSelected, SVNRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
+                                       CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));\r
                        }\r
                        break;\r
                case ID_BLAMECOMPARE:\r
@@ -4075,12 +4139,12 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                //now first get the revision which is selected\r
                                if (PromptShown())\r
                                {\r
-                                       SVNDiff diff(this, this->m_hWnd, true);\r
+                                       GitDiff diff(this, this->m_hWnd, true);\r
                                        diff.SetHEADPeg(m_LogRevision);\r
-                                       diff.ShowCompare(m_path, SVNRev::REV_BASE, m_path, revSelected, SVNRev(), false, true);\r
+                                       diff.ShowCompare(m_path, GitRev::REV_BASE, m_path, revSelected, GitRev(), false, true);\r
                                }\r
                                else\r
-                                       CAppUtils::StartShowCompare(m_hWnd, m_path, SVNRev::REV_BASE, m_path, revSelected, SVNRev(), m_LogRevision, false, false, true);\r
+                                       CAppUtils::StartShowCompare(m_hWnd, m_path, GitRev::REV_BASE, m_path, revSelected, GitRev(), m_LogRevision, false, false, true);\r
                        }\r
                        break;\r
                case ID_BLAMETWO:\r
@@ -4088,12 +4152,12 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                //user clicked on the menu item "compare and blame revisions"\r
                                if (PromptShown())\r
                                {\r
-                                       SVNDiff diff(this, this->m_hWnd, true);\r
+                                       GitDiff diff(this, this->m_hWnd, true);\r
                                        diff.SetHEADPeg(m_LogRevision);\r
-                                       diff.ShowCompare(CTSVNPath(pathURL), revSelected2, CTSVNPath(pathURL), revSelected, SVNRev(), false, true);\r
+                                       diff.ShowCompare(CTGitPath(pathURL), revSelected2, CTGitPath(pathURL), revSelected, GitRev(), false, true);\r
                                }\r
                                else\r
-                                       CAppUtils::StartShowCompare(m_hWnd, CTSVNPath(pathURL), revSelected2, CTSVNPath(pathURL), revSelected, SVNRev(), m_LogRevision, false, false, true);\r
+                                       CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revSelected2, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, false, false, true);\r
                        }\r
                        break;\r
                case ID_BLAMEWITHPREVIOUS:\r
@@ -4101,12 +4165,12 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                //user clicked on the menu item "Compare and Blame with previous revision"\r
                                if (PromptShown())\r
                                {\r
-                                       SVNDiff diff(this, this->m_hWnd, true);\r
+                                       GitDiff diff(this, this->m_hWnd, true);\r
                                        diff.SetHEADPeg(m_LogRevision);\r
-                                       diff.ShowCompare(CTSVNPath(pathURL), revPrevious, CTSVNPath(pathURL), revSelected, SVNRev(), false, true);\r
+                                       diff.ShowCompare(CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), false, true);\r
                                }\r
                                else\r
-                                       CAppUtils::StartShowCompare(m_hWnd, CTSVNPath(pathURL), revPrevious, CTSVNPath(pathURL), revSelected, SVNRev(), m_LogRevision, false, false, true);\r
+                                       CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, false, false, true);\r
                        }\r
                        break;\r
                case ID_SAVEAS:\r
@@ -4124,7 +4188,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                }\r
                                if (CAppUtils::FileOpenSave(revFilename, NULL, IDS_LOG_POPUP_SAVE, IDS_COMMONFILEFILTER, false, m_hWnd))\r
                                {\r
-                                       CTSVNPath tempfile;\r
+                                       CTGitPath tempfile;\r
                                        tempfile.SetFromWin(revFilename);\r
                                        CProgressDlg progDlg;\r
                                        progDlg.SetTitle(IDS_APPNAME);\r
@@ -4134,14 +4198,14 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                        progDlg.SetLine(1, sInfoLine, true);\r
                                        SetAndClearProgressInfo(&progDlg);\r
                                        progDlg.ShowModeless(m_hWnd);\r
-                                       if (!Cat(m_path, SVNRev(SVNRev::REV_HEAD), revSelected, tempfile))\r
+                                       if (!Cat(m_path, GitRev(GitRev::REV_HEAD), revSelected, tempfile))\r
                                        {\r
                                                // try again with another peg revision\r
                                                if (!Cat(m_path, revSelected, revSelected, tempfile))\r
                                                {\r
                                                        progDlg.Stop();\r
                                                        SetAndClearProgressInfo((HWND)NULL);\r
-                                                       CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                        EnableOKButton();\r
                                                        break;\r
                                                }\r
@@ -4163,9 +4227,9 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                progDlg.SetLine(1, sInfoLine, true);\r
                                SetAndClearProgressInfo(&progDlg);\r
                                progDlg.ShowModeless(m_hWnd);\r
-                               CTSVNPath tempfile = CTempFiles::Instance().GetTempFilePath(false, m_path, revSelected);\r
+                               CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, m_path, revSelected);\r
                                bool bSuccess = true;\r
-                               if (!Cat(m_path, SVNRev(SVNRev::REV_HEAD), revSelected, tempfile))\r
+                               if (!Cat(m_path, GitRev(GitRev::REV_HEAD), revSelected, tempfile))\r
                                {\r
                                        bSuccess = false;\r
                                        // try again, but with the selected revision as the peg revision\r
@@ -4173,7 +4237,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                        {\r
                                                progDlg.Stop();\r
                                                SetAndClearProgressInfo((HWND)NULL);\r
-                                               CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                EnableOKButton();\r
                                                break;\r
                                        }\r
@@ -4215,7 +4279,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                                }\r
                                                else\r
                                                {\r
-                                                       CString sParams = _T("/path:\"") + m_path.GetSVNPathString() + _T("\" ");\r
+                                                       CString sParams = _T("/path:\"") + m_path.GetGitPathString() + _T("\" ");\r
                                                        if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(m_path.GetFileOrDirectoryName()),sParams))\r
                                                        {\r
                                                                break;\r
@@ -4224,7 +4288,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                                        }\r
                                        else\r
                                        {\r
-                                               CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        }\r
                                }\r
                        }\r
@@ -4232,7 +4296,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                case ID_UPDATE:\r
                        {\r
                                CString sCmd;\r
-                               CString url = _T("tsvn:")+pathURL;\r
+                               CString url = _T("tgit:")+pathURL;\r
                                sCmd.Format(_T("%s /command:update /path:\"%s\" /rev:%ld"),\r
                                        (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),\r
                                        (LPCTSTR)m_path.GetWinPath(), (LONG)revSelected);\r
@@ -4279,8 +4343,8 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                        {\r
                                CEditPropertiesDlg dlg;\r
                                dlg.SetProjectProperties(&m_ProjectProperties);\r
-                               CTSVNPathList escapedlist;\r
-                               dlg.SetPathList(CTSVNPathList(CTSVNPath(pathURL)));\r
+                               CTGitPathList escapedlist;\r
+                               dlg.SetPathList(CTGitPathList(CTGitPath(pathURL)));\r
                                dlg.SetRevision(revSelected);\r
                                dlg.RevProps(true);\r
                                dlg.DoModal();\r
@@ -4303,7 +4367,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                case ID_CHECKOUT:\r
                        {\r
                                CString sCmd;\r
-                               CString url = _T("tsvn:")+pathURL;\r
+                               CString url = _T("tgit:")+pathURL;\r
                                sCmd.Format(_T("%s /command:checkout /url:\"%s\" /revision:%ld"),\r
                                        (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),\r
                                        (LPCTSTR)url, (LONG)revSelected);\r
@@ -4322,7 +4386,7 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                case ID_VIEWPATHREV:\r
                        {\r
                                CString relurl = pathURL;\r
-                               CString sRoot = GetRepositoryRoot(CTSVNPath(relurl));\r
+                               CString sRoot = GetRepositoryRoot(CTGitPath(relurl));\r
                                relurl = relurl.Mid(sRoot.GetLength());\r
                                CString url = m_ProjectProperties.sWebViewerPathRev;\r
                                url = GetAbsoluteUrlFromRelativeUrl(url);\r
@@ -4338,10 +4402,12 @@ void CLogDlg::ShowContextMenuForRevisions(CWnd* /*pWnd*/, CPoint point)
                theApp.DoWaitCursor(-1);\r
                EnableOKButton();\r
        } // if (popup.CreatePopupMenu())\r
+#endif\r
 }\r
 \r
 void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)\r
 {\r
+#if 0\r
        int selIndex = m_ChangedFileListCtrl.GetSelectionMark();\r
        if ((point.x == -1) && (point.y == -1))\r
        {\r
@@ -4362,8 +4428,8 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                return; // nothing is selected, get out of here\r
 \r
        PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
-       svn_revnum_t rev1 = pLogEntry->Rev;\r
-       svn_revnum_t rev2 = rev1;\r
+       git_revnum_t rev1 = pLogEntry->Rev;\r
+       git_revnum_t rev2 = rev1;\r
        bool bOneRev = true;\r
        if (pos)\r
        {\r
@@ -4372,8 +4438,8 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                        pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetNextSelectedItem(pos)));\r
                        if (pLogEntry)\r
                        {\r
-                               rev1 = max(rev1,(svn_revnum_t)pLogEntry->Rev);\r
-                               rev2 = min(rev2,(svn_revnum_t)pLogEntry->Rev);\r
+                               rev1 = max(rev1,(git_revnum_t)pLogEntry->Rev);\r
+                               rev2 = min(rev2,(git_revnum_t)pLogEntry->Rev);\r
                                bOneRev = false;\r
                        }                               \r
                }\r
@@ -4383,7 +4449,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                while (pos)\r
                {\r
                        int nItem = m_ChangedFileListCtrl.GetNextSelectedItem(pos);\r
-                       changedpaths.push_back(m_currentChangedPathList[nItem].GetSVNPathString());\r
+                       changedpaths.push_back(m_currentChangedPathList[nItem].GetGitPathString());\r
                }\r
        }\r
        else\r
@@ -4406,10 +4472,10 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                {\r
                                        // if the path was modified but the parent path was 'added with history'\r
                                        // then we have to use the copy from revision of the parent path\r
-                                       CTSVNPath cpath = CTSVNPath(changedlogpath->sPath);\r
+                                       CTGitPath cpath = CTGitPath(changedlogpath->sPath);\r
                                        for (int flist = 0; flist < pLogEntry->pArChangedPaths->GetCount(); ++flist)\r
                                        {\r
-                                               CTSVNPath p = CTSVNPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);\r
+                                               CTGitPath p = CTGitPath(pLogEntry->pArChangedPaths->GetAt(flist)->sPath);\r
                                                if (p.IsAncestorOf(cpath))\r
                                                {\r
                                                        if (!pLogEntry->pArChangedPaths->GetAt(flist)->sCopyFromPath.IsEmpty())\r
@@ -4516,9 +4582,9 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                SetPromptApp(&theApp);\r
                                theApp.DoWaitCursor(1);\r
                                CString sUrl;\r
-                               if (SVN::PathIsURL(m_path))\r
+                               if (Git::PathIsURL(m_path))\r
                                {\r
-                                       sUrl = m_path.GetSVNPathString();\r
+                                       sUrl = m_path.GetGitPathString();\r
                                }\r
                                else\r
                                {\r
@@ -4528,7 +4594,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                                theApp.DoWaitCursor(-1);\r
                                                CString temp;\r
                                                temp.Format(IDS_ERR_NOURLOFFILE, m_path.GetWinPath());\r
-                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                                                EnableOKButton();\r
                                                theApp.DoWaitCursor(-1);\r
                                                break;          //exit\r
@@ -4536,7 +4602,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                }\r
                                // find the working copy path of the selected item from the URL\r
                                m_bCancelled = false;\r
-                               CString sUrlRoot = GetRepositoryRoot(CTSVNPath(sUrl));\r
+                               CString sUrlRoot = GetRepositoryRoot(CTGitPath(sUrl));\r
 \r
                                CString fileURL = changedpaths[0];\r
                                fileURL = sUrlRoot + fileURL.Trim();\r
@@ -4551,13 +4617,13 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                CString wcPath = m_path.GetWinPathString().Left(leftcount);\r
                                wcPath += fileURL.Mid(i);\r
                                wcPath.Replace('/', '\\');\r
-                               CSVNProgressDlg dlg;\r
+                               CGitProgressDlg dlg;\r
                                if (changedlogpaths[0]->action == LOGACTIONS_DELETED)\r
                                {\r
                                        // a deleted path! Since the path isn't there anymore, merge\r
                                        // won't work. So just do a copy url->wc\r
-                                       dlg.SetCommand(CSVNProgressDlg::SVNProgress_Copy);\r
-                                       dlg.SetPathList(CTSVNPathList(CTSVNPath(fileURL)));\r
+                                       dlg.SetCommand(CGitProgressDlg::GitProgress_Copy);\r
+                                       dlg.SetPathList(CTGitPathList(CTGitPath(fileURL)));\r
                                        dlg.SetUrl(wcPath);\r
                                        dlg.SetRevision(rev2);\r
                                }\r
@@ -4572,17 +4638,17 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                                theApp.DoWaitCursor(-1);\r
                                                break;          //exit\r
                                        }\r
-                                       dlg.SetCommand(CSVNProgressDlg::SVNProgress_Merge);\r
-                                       dlg.SetPathList(CTSVNPathList(CTSVNPath(wcPath)));\r
+                                       dlg.SetCommand(CGitProgressDlg::GitProgress_Merge);\r
+                                       dlg.SetPathList(CTGitPathList(CTGitPath(wcPath)));\r
                                        dlg.SetUrl(fileURL);\r
                                        dlg.SetSecondUrl(fileURL);\r
-                                       SVNRevRangeArray revarray;\r
+                                       GitRevRangeArray revarray;\r
                                        revarray.AddRevRange(rev1, rev2);\r
                                        dlg.SetRevisionRanges(revarray);\r
                                }\r
                                CString msg;\r
                                msg.Format(IDS_LOG_REVERT_CONFIRM, (LPCTSTR)wcPath);\r
-                               if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION) == IDYES)\r
+                               if (CMessageBox::Show(this->m_hWnd, msg, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES)\r
                                {\r
                                        dlg.DoModal();\r
                                }\r
@@ -4595,9 +4661,9 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                SetPromptApp(&theApp);\r
                                theApp.DoWaitCursor(1);\r
                                CString filepath;\r
-                               if (SVN::PathIsURL(m_path))\r
+                               if (Git::PathIsURL(m_path))\r
                                {\r
-                                       filepath = m_path.GetSVNPathString();\r
+                                       filepath = m_path.GetGitPathString();\r
                                }\r
                                else\r
                                {\r
@@ -4607,17 +4673,17 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                                theApp.DoWaitCursor(-1);\r
                                                CString temp;\r
                                                temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
-                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                                                TRACE(_T("could not retrieve the URL of the file!\n"));\r
                                                EnableOKButton();\r
                                                break;\r
                                        }\r
                                }\r
-                               filepath = GetRepositoryRoot(CTSVNPath(filepath));\r
+                               filepath = GetRepositoryRoot(CTGitPath(filepath));\r
                                filepath += changedpaths[0];\r
                                CPropDlg dlg;\r
                                dlg.m_rev = rev1;\r
-                               dlg.m_Path = CTSVNPath(filepath);\r
+                               dlg.m_Path = CTGitPath(filepath);\r
                                dlg.DoModal();\r
                                EnableOKButton();\r
                                theApp.DoWaitCursor(-1);\r
@@ -4629,9 +4695,9 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                SetPromptApp(&theApp);\r
                                theApp.DoWaitCursor(1);\r
                                CString filepath;\r
-                               if (SVN::PathIsURL(m_path))\r
+                               if (Git::PathIsURL(m_path))\r
                                {\r
-                                       filepath = m_path.GetSVNPathString();\r
+                                       filepath = m_path.GetGitPathString();\r
                                }\r
                                else\r
                                {\r
@@ -4641,18 +4707,18 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                                theApp.DoWaitCursor(-1);\r
                                                CString temp;\r
                                                temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
-                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                                                TRACE(_T("could not retrieve the URL of the file!\n"));\r
                                                EnableOKButton();\r
                                                break;\r
                                        }\r
                                }\r
                                m_bCancelled = false;\r
-                               CString sRoot = GetRepositoryRoot(CTSVNPath(filepath));\r
+                               CString sRoot = GetRepositoryRoot(CTGitPath(filepath));\r
                                // if more than one entry is selected, we save them\r
                                // one by one into a folder the user has selected\r
                                bool bTargetSelected = false;\r
-                               CTSVNPath TargetPath;\r
+                               CTGitPath TargetPath;\r
                                if (m_ChangedFileListCtrl.GetSelectedCount() > 1)\r
                                {\r
                                        CBrowseFolder browseFolder;\r
@@ -4661,7 +4727,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                        CString strSaveAsDirectory;\r
                                        if (browseFolder.Show(GetSafeHwnd(), strSaveAsDirectory) == CBrowseFolder::OK) \r
                                        {\r
-                                               TargetPath = CTSVNPath(strSaveAsDirectory);\r
+                                               TargetPath = CTGitPath(strSaveAsDirectory);\r
                                                bTargetSelected = true;\r
                                        }\r
                                }\r
@@ -4686,7 +4752,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                        progDlg.SetAnimation(IDR_DOWNLOAD);\r
                                        for (std::vector<LogChangedPath*>::iterator it = changedlogpaths.begin(); it!= changedlogpaths.end(); ++it)\r
                                        {\r
-                                               SVNRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;\r
+                                               GitRev getrev = ((*it)->action == LOGACTIONS_DELETED) ? rev2 : rev1;\r
 \r
                                                CString sInfoLine;\r
                                                sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, (LPCTSTR)filepath, (LPCTSTR)getrev.ToString());\r
@@ -4694,7 +4760,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                                SetAndClearProgressInfo(&progDlg);\r
                                                progDlg.ShowModeless(m_hWnd);\r
 \r
-                                               CTSVNPath tempfile = TargetPath;\r
+                                               CTGitPath tempfile = TargetPath;\r
                                                if (changedpaths.size() > 1)\r
                                                {\r
                                                        // if multiple items are selected, then the TargetPath\r
@@ -4722,11 +4788,11 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                                        // use the export command from the top pane of the log dialog.\r
                                                }\r
                                                filepath = sRoot + (*it)->sPath;\r
-                                               if (!Cat(CTSVNPath(filepath), getrev, getrev, tempfile))\r
+                                               if (!Cat(CTGitPath(filepath), getrev, getrev, tempfile))\r
                                                {\r
                                                        progDlg.Stop();\r
                                                        SetAndClearProgressInfo((HWND)NULL);\r
-                                                       CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                                       CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                                        EnableOKButton();\r
                                                        theApp.DoWaitCursor(-1);\r
                                                        break;\r
@@ -4743,16 +4809,16 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                        bOpenWith = true;\r
                case ID_OPEN:\r
                        {\r
-                               SVNRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;\r
+                               GitRev getrev = pLogEntry->pArChangedPaths->GetAt(selIndex)->action == LOGACTIONS_DELETED ? rev2 : rev1;\r
                                Open(bOpenWith,changedpaths[0],getrev);\r
                        }\r
                        break;\r
                case ID_BLAME:\r
                        {\r
                                CString filepath;\r
-                               if (SVN::PathIsURL(m_path))\r
+                               if (Git::PathIsURL(m_path))\r
                                {\r
-                                       filepath = m_path.GetSVNPathString();\r
+                                       filepath = m_path.GetGitPathString();\r
                                }\r
                                else\r
                                {\r
@@ -4762,13 +4828,13 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                                theApp.DoWaitCursor(-1);\r
                                                CString temp;\r
                                                temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
-                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                                                TRACE(_T("could not retrieve the URL of the file!\n"));\r
                                                EnableOKButton();\r
                                                break;\r
                                        }\r
                                }\r
-                               filepath = GetRepositoryRoot(CTSVNPath(filepath));\r
+                               filepath = GetRepositoryRoot(CTGitPath(filepath));\r
                                filepath += changedpaths[0];\r
                                CBlameDlg dlg;\r
                                dlg.EndRev = rev1;\r
@@ -4777,7 +4843,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                        CBlame blame;\r
                                        CString tempfile;\r
                                        CString logfile;\r
-                                       tempfile = blame.BlameToTempFile(CTSVNPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);\r
+                                       tempfile = blame.BlameToTempFile(CTGitPath(filepath), dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);\r
                                        if (!tempfile.IsEmpty())\r
                                        {\r
                                                if (dlg.m_bTextView)\r
@@ -4796,7 +4862,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                        }\r
                                        else\r
                                        {\r
-                                               CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
                                        }\r
                                }\r
                        }\r
@@ -4810,9 +4876,9 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                SetPromptApp(&theApp);\r
                                theApp.DoWaitCursor(1);\r
                                CString filepath;\r
-                               if (SVN::PathIsURL(m_path))\r
+                               if (Git::PathIsURL(m_path))\r
                                {\r
-                                       filepath = m_path.GetSVNPathString();\r
+                                       filepath = m_path.GetGitPathString();\r
                                }\r
                                else\r
                                {\r
@@ -4822,16 +4888,16 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                                                theApp.DoWaitCursor(-1);\r
                                                CString temp;\r
                                                temp.Format(IDS_ERR_NOURLOFFILE, (LPCTSTR)filepath);\r
-                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);\r
+                                               CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);\r
                                                TRACE(_T("could not retrieve the URL of the file!\n"));\r
                                                EnableOKButton();\r
                                                break;\r
                                        }\r
                                }\r
                                m_bCancelled = false;\r
-                               filepath = GetRepositoryRoot(CTSVNPath(filepath));\r
+                               filepath = GetRepositoryRoot(CTGitPath(filepath));\r
                                filepath += changedpaths[0];\r
-                               svn_revnum_t logrev = rev1;\r
+                               git_revnum_t logrev = rev1;\r
                                if (changedlogpaths[0]->action == LOGACTIONS_DELETED)\r
                                {\r
                                        // if the item got deleted in this revision,\r
@@ -4851,7 +4917,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                case ID_VIEWPATHREV:\r
                        {\r
                                PLOGENTRYDATA pLogEntry = reinterpret_cast<PLOGENTRYDATA>(m_arShownList.GetAt(m_LogList.GetSelectionMark()));\r
-                               SVNRev rev = pLogEntry->Rev;\r
+                               GitRev rev = pLogEntry->Rev;\r
                                CString relurl = changedpaths[0];\r
                                CString url = m_ProjectProperties.sWebViewerPathRev;\r
                                url.Replace(_T("%REVISION%"), rev.ToString());\r
@@ -4866,6 +4932,7 @@ void CLogDlg::ShowContextMenuForChangedpaths(CWnd* /*pWnd*/, CPoint point)
                        break;\r
                } // switch (cmd)\r
        } // if (popup.CreatePopupMenu())\r
+#endif\r
 }\r
 \r
 void CLogDlg::OnDtnDropdownDatefrom(NMHDR * /*pNMHDR*/, LRESULT *pResult)\r

diff --git a/TortoiseProc/LogDlg.h b/TortoiseProc/LogDlg.h
index 31556cf..2e691c9 100644 (file)
--- a/TortoiseProc/LogDlg.h
+++ b/TortoiseProc/LogDlg.h
@@ -59,7 +59,7 @@ typedef int (__cdecl *GENERICCOMPAREFN)(const void * elem1, const void * elem2);
  * \ingroup TortoiseProc\r
  * Shows log messages of a single file or folder in a listbox. \r
  */\r
-class CLogDlg : public CResizableStandAloneDialog, public Git, IFilterEditValidator\r
+class CLogDlg : public CResizableStandAloneDialog, IFilterEditValidator\r
 {\r
        DECLARE_DYNAMIC(CLogDlg)\r
        \r
@@ -80,14 +80,14 @@ public:
        void ContinuousSelection(bool bCont = true) {m_bSelectionMustBeContinuous = bCont;}\r
        void SetMergePath(const CTGitPath& mergepath) {m_mergePath = mergepath;}\r
 \r
-       const GitRevRangeArray& GetSelectedRevRanges() {return m_selectedRevs;}\r
+//     const GitRevRangeArray& GetSelectedRevRanges() {return m_selectedRevs;}\r
 \r
 // Dialog Data\r
        enum { IDD = IDD_LOGMESSAGE };\r
 \r
 protected:\r
        //implement the virtual methods from Git base class\r
-       virtual BOOL Log(svn_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths, apr_time_t time, int filechanges, BOOL copies, DWORD actions, BOOL haschildren);\r
+       virtual BOOL Log(git_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths,  int filechanges, BOOL copies, DWORD actions, BOOL haschildren);\r
        virtual BOOL Cancel();\r
        virtual bool Validate(LPCTSTR string);\r
 \r
@@ -135,7 +135,7 @@ protected:
        virtual BOOL PreTranslateMessage(MSG* pMsg);\r
 \r
        void    FillLogMessageCtrl(bool bShow = true);\r
-       void    DoDiffFromLog(INT_PTR selIndex, svn_revnum_t rev1, svn_revnum_t rev2, bool blame, bool unified);\r
+       void    DoDiffFromLog(INT_PTR selIndex, git_revnum_t rev1, git_revnum_t rev2, bool blame, bool unified);\r
 \r
        DECLARE_MESSAGE_MAP()\r
 \r
@@ -143,8 +143,8 @@ private:
        static UINT LogThreadEntry(LPVOID pVoid);\r
        UINT LogThread();\r
        void Refresh (bool autoGoOnline = false);\r
-       BOOL IsDiffPossible(LogChangedPath * changedpath, svn_revnum_t rev);\r
-       BOOL Open(bool bOpenWith, CString changedpath, svn_revnum_t rev);\r
+       BOOL IsDiffPossible(LogChangedPath * changedpath, git_revnum_t rev);\r
+       BOOL Open(bool bOpenWith, CString changedpath, git_revnum_t rev);\r
        void EditAuthor(const CLogDataVector& logs);\r
        void EditLogMessage(int index);\r
        void DoSizeV1(int delta);\r
@@ -210,8 +210,8 @@ private:
        GitRev                          m_LogRevision;\r
        GitRev                          m_endrev;\r
        GitRev                          m_wcRev;\r
-       GitRevRangeArray        m_selectedRevs;\r
-       GitRevRangeArray        m_selectedRevsOneRange;\r
+//     GitRevRangeArray        m_selectedRevs;\r
+//     GitRevRangeArray        m_selectedRevsOneRange;\r
        bool                            m_bSelectionMustBeContinuous;\r
        long                            m_logcounter;\r
        bool                            m_bCancelled;\r
@@ -219,7 +219,7 @@ private:
        BOOL                            m_bStrict;\r
        bool                            m_bStrictStopped;\r
        BOOL                            m_bIncludeMerges;\r
-       svn_revnum_t            m_lowestRev;\r
+       git_revnum_t            m_lowestRev;\r
        BOOL                            m_bSaveStrict;\r
        LogChangedPathArray * m_currentChangedArray;\r
        LogChangedPathArray m_CurrentFilteredChangedArray;\r
@@ -259,7 +259,7 @@ private:
        bool                            m_bSelect;\r
        bool                            m_bShowBugtraqColumn;\r
        CString                         m_sLogInfo;\r
-       std::set<svn_revnum_t> m_mergedRevs;\r
+       std::set<git_revnum_t> m_mergedRevs;\r
 \r
        CToolTips                       m_tooltips;\r
 \r

diff --git a/TortoiseProc/LogDlgHelper.cpp b/TortoiseProc/LogDlgHelper.cpp
index c8e821d..ad39bc1 100644 (file)
--- a/TortoiseProc/LogDlgHelper.cpp
+++ b/TortoiseProc/LogDlgHelper.cpp
@@ -22,6 +22,7 @@
 \r
 CStoreSelection::CStoreSelection(CLogDlg* dlg)\r
 {\r
+#if 0\r
        m_logdlg = dlg;\r
 \r
        int selIndex = m_logdlg->m_LogList.GetSelectionMark();\r
@@ -44,10 +45,12 @@ CStoreSelection::CStoreSelection(CLogDlg* dlg)
                        }\r
                }\r
        }\r
+#endif\r
 }\r
 \r
 CStoreSelection::~CStoreSelection()\r
 {\r
+#if 0\r
        if ( m_SetSelectedRevisions.size()>0 )\r
        {\r
                for (int i=0; i<m_logdlg->m_arShownList.GetCount(); ++i)\r
@@ -61,6 +64,7 @@ CStoreSelection::~CStoreSelection()
                        }\r
                }\r
        }\r
+#endif\r
 }\r
 \r
 void CLogDataVector::ClearAll()\r

diff --git a/TortoiseProc/LogDlgHelper.h b/TortoiseProc/LogDlgHelper.h
index 7d41711..3cf05fb 100644 (file)
--- a/TortoiseProc/LogDlgHelper.h
+++ b/TortoiseProc/LogDlgHelper.h
@@ -18,6 +18,8 @@
 //\r
 #pragma once\r
 #include "Git.h"\r
+#include "GitStatus.h"\r
+#include "ILogReceiver.h"\r
 \r
 class CLogDlg;\r
 \r

diff --git a/TortoiseProc/PropDlg.h b/TortoiseProc/PropDlg.h
index edb6ee2..dd4a572 100644 (file)
--- a/TortoiseProc/PropDlg.h
+++ b/TortoiseProc/PropDlg.h
@@ -19,7 +19,7 @@
 #pragma once\r
 \r
 #include "StandAloneDlg.h"\r
-#include "SVNRev.h"\r
+#include "GitRev.h"\r
 \r
 /**\r
  * \ingroup TortoiseProc\r
@@ -49,8 +49,8 @@ protected:
        DECLARE_MESSAGE_MAP()\r
 \r
 public:\r
-       CTSVNPath       m_Path;\r
-       SVNRev          m_rev;\r
+       CTGitPath       m_Path;\r
+       GitRev          m_rev;\r
 private:\r
        HANDLE          m_hThread;\r
        CListCtrl       m_proplist;\r

diff --git a/TortoiseProc/SVNProgressDlg.h b/TortoiseProc/SVNProgressDlg.h
index b5d249a..9784a65 100644 (file)
--- a/TortoiseProc/SVNProgressDlg.h
+++ b/TortoiseProc/SVNProgressDlg.h
@@ -1,6 +1,6 @@
-// TortoiseSVN - a Windows shell extension for easy version control\r
+// TortoiseGit - a Windows shell extension for easy version control\r
 \r
-// Copyright (C) 2003-2008 - TortoiseSVN\r
+// Copyright (C) 2003-2008 - TortoiseGit\r
 \r
 // This program is free software; you can redistribute it and/or\r
 // modify it under the terms of the GNU General Public License\r
@@ -19,11 +19,12 @@
 #pragma once\r
 \r
 #include "StandAloneDlg.h"\r
-#include "TSVNPath.h"\r
+#include "TGitPath.h"\r
 #include "ProjectProperties.h"\r
 #include "Git.h"\r
+#include "GitStatus.h"\r
 #include "Colors.h"\r
-#include "..\IBugTraqProvider\IBugTraqProvider_h.h"\r
+//#include "..\IBugTraqProvider\IBugTraqProvider_h.h"\r
 #include "afxwin.h"\r
 \r
 typedef int (__cdecl *GENERICCOMPAREFN)(const void * elem1, const void * elem2);\r
@@ -71,57 +72,57 @@ typedef enum
  * in a listbox. Since several Subversion commands have similar notify\r
  * messages they are grouped together in this single class.\r
  */\r
-class CsProgressDlg : public CResizableStandAloneDialog, public SVN\r
+class CGitProgressDlg : public CResizableStandAloneDialog\r
 {\r
 public:\r
        typedef enum\r
        {\r
-               SVNProgress_Add,\r
-               SVNProgress_Checkout,\r
-               SVNProgress_Commit,\r
-               SVNProgress_Copy,\r
-               SVNProgress_Export,\r
-               SVNProgress_Import,\r
-               SVNProgress_Lock,\r
-               SVNProgress_Merge,\r
-               SVNProgress_MergeReintegrate,\r
-               SVNProgress_MergeAll,\r
-               SVNProgress_Rename,\r
-               SVNProgress_Resolve,\r
-               SVNProgress_Revert,\r
-               SVNProgress_Switch,\r
-               SVNProgress_Unlock,\r
-               SVNProgress_Update,\r
+               GitProgress_Add,\r
+               GitProgress_Checkout,\r
+               GitProgress_Commit,\r
+               GitProgress_Copy,\r
+               GitProgress_Export,\r
+               GitProgress_Import,\r
+               GitProgress_Lock,\r
+               GitProgress_Merge,\r
+               GitProgress_MergeReintegrate,\r
+               GitProgress_MergeAll,\r
+               GitProgress_Rename,\r
+               GitProgress_Resolve,\r
+               GitProgress_Revert,\r
+               GitProgress_Switch,\r
+               GitProgress_Unlock,\r
+               GitProgress_Update,\r
        } Command;\r
 \r
 \r
-       DECLARE_DYNAMIC(CSVNProgressDlg)\r
+       DECLARE_DYNAMIC(CGitProgressDlg)\r
 \r
 public:\r
 \r
-       CSVNProgressDlg(CWnd* pParent = NULL);\r
-       virtual ~CSVNProgressDlg();\r
+       CGitProgressDlg(CWnd* pParent = NULL);\r
+       virtual ~CGitProgressDlg();\r
 \r
 \r
        void SetCommand(Command cmd) {m_Command = cmd;}\r
        void SetAutoClose(DWORD ac) {m_dwCloseOnEnd = ac;}\r
        void SetOptions(DWORD opts) {m_options = opts;}\r
-       void SetPathList(const CTSVNPathList& pathList) {m_targetPathList = pathList;}\r
+       void SetPathList(const CTGitPathList& pathList) {m_targetPathList = pathList;}\r
        void SetUrl(const CString& url) {m_url.SetFromUnknown(url);}\r
        void SetSecondUrl(const CString& url) {m_url2.SetFromUnknown(url);}\r
        void SetCommitMessage(const CString& msg) {m_sMessage = msg;}\r
        \r
-       void SetRevision(const SVNRev& rev) {m_Revision = rev;}\r
-       void SetRevisionEnd(const SVNRev& rev) {m_RevisionEnd = rev;}\r
+       void SetRevision(const GitRev& rev) {m_Revision = rev;}\r
+       void SetRevisionEnd(const GitRev& rev) {m_RevisionEnd = rev;}\r
        \r
        void SetDiffOptions(const CString& opts) {m_diffoptions = opts;}\r
-       void SetDepth(svn_depth_t depth = svn_depth_unknown) {m_depth = depth;}\r
-       void SetPegRevision(SVNRev pegrev = SVNRev()) {m_pegRev = pegrev;}\r
+       void SetDepth(git_depth_t depth = git_depth_unknown) {m_depth = depth;}\r
+       void SetPegRevision(GitRev pegrev = GitRev()) {m_pegRev = pegrev;}\r
        void SetProjectProperties(ProjectProperties props) {m_ProjectProperties = props;}\r
        void SetChangeList(const CString& changelist, bool keepchangelist) {m_changelist = changelist; m_keepchangelist = keepchangelist;}\r
-       void SetSelectedList(const CTSVNPathList& selPaths);\r
-       void SetRevisionRanges(const SVNRevRangeArray& revArray) {m_revisionArray = revArray;}\r
-       void SetBugTraqProvider(const CComPtr<IBugTraqProvider> pBugtraqProvider) { m_BugTraqProvider = pBugtraqProvider;}\r
+       void SetSelectedList(const CTGitPathList& selPaths);\r
+//     void SetRevisionRanges(const GitRevRangeArray& revArray) {m_revisionArray = revArray;}\r
+//     void SetBugTraqProvider(const CComPtr<IBugTraqProvider> pBugtraqProvider) { m_BugTraqProvider = pBugtraqProvider;}\r
        /**\r
         * If the number of items for which the operation is done on is known\r
         * beforehand, that number can be set here. It is then used to show a more\r
@@ -140,52 +141,57 @@ private:
        {\r
        public:\r
                NotificationData() :\r
-                 action((svn_wc_notify_action_t)-1),\r
-                         kind(svn_node_none),\r
-                         content_state(svn_wc_notify_state_inapplicable),\r
-                         prop_state(svn_wc_notify_state_inapplicable),\r
+#if 0\r
+                 action((git_wc_notify_action_t)-1),\r
+                         kind(git_node_none),\r
+                         content_state(git_wc_notify_state_inapplicable),\r
+                         prop_state(git_wc_notify_state_inapplicable),\r
                          rev(0),\r
+#endif\r
                          color(::GetSysColor(COLOR_WINDOWTEXT)),\r
                          bConflictedActionItem(false),\r
-                         bAuxItem(false),\r
-                         lock_state(svn_wc_notify_lock_state_unchanged)\r
+                         bAuxItem(false)\r
+                         //,\r
+//                       lock_state(git_wc_notify_lock_state_unchanged)\r
                  {\r
-                         merge_range.end = 0;\r
-                         merge_range.start = 0;\r
+//                       merge_range.end = 0;\r
+//                       merge_range.start = 0;\r
                  }\r
        public:\r
-               // The text we put into the first column (the SVN action for normal items, just text for aux items)\r
+               // The text we put into the first column (the Git action for normal items, just text for aux items)\r
                CString                                 sActionColumnText;      \r
-               CTSVNPath                               path;\r
-               CTSVNPath                               basepath;\r
+               CTGitPath                               path;\r
+               CTGitPath                               basepath;\r
                CString                                 changelistname;\r
 \r
-               svn_wc_notify_action_t  action;\r
-               svn_node_kind_t                 kind;\r
+///            git_wc_notify_action_t  action;\r
+//             git_node_kind_t                 kind;\r
                CString                                 mime_type;\r
-               svn_wc_notify_state_t   content_state;\r
-               svn_wc_notify_state_t   prop_state;\r
-               svn_wc_notify_lock_state_t lock_state;\r
-               svn_merge_range_t               merge_range;\r
-               svn_revnum_t                    rev;\r
+//             git_wc_notify_state_t   content_state;\r
+//             git_wc_notify_state_t   prop_state;\r
+//             git_wc_notify_lock_state_t lock_state;\r
+//             git_merge_range_t               merge_range;\r
+               git_revnum_t                    rev;\r
                COLORREF                                color;\r
                CString                                 owner;                                          ///< lock owner\r
                bool                                    bConflictedActionItem;          // Is this item a conflict?\r
-               bool                                    bAuxItem;                                       // Set if this item is not a true 'SVN action' \r
+               bool                                    bAuxItem;                                       // Set if this item is not a true 'Git action' \r
                CString                                 sPathColumnText;        \r
 \r
        };\r
 protected:\r
-       //implement the virtual methods from SVN base class\r
-       virtual BOOL Notify(const CTSVNPath& path, svn_wc_notify_action_t action, \r
-               svn_node_kind_t kind, const CString& mime_type, \r
-               svn_wc_notify_state_t content_state, \r
-               svn_wc_notify_state_t prop_state, LONG rev,\r
-               const svn_lock_t * lock, svn_wc_notify_lock_state_t lock_state,\r
+\r
+#if 0  //implement the virtual methods from Git base class\r
+       virtual BOOL Notify(const CTGitPath& path, git_wc_notify_action_t action, \r
+               git_node_kind_t kind, const CString& mime_type, \r
+               git_wc_notify_state_t content_state, \r
+               git_wc_notify_state_t prop_state, LONG rev,\r
+               const git_lock_t * lock, git_wc_notify_lock_state_t lock_state,\r
                const CString& changelistname,\r
-               svn_merge_range_t * range,\r
-               svn_error_t * err, apr_pool_t * pool);\r
-       virtual svn_wc_conflict_choice_t        ConflictResolveCallback(const svn_wc_conflict_description_t *description, CString& mergedfile);\r
+               git_merge_range_t * range,\r
+               git_error_t * err, apr_pool_t * pool);\r
+#endif\r
+//     virtual git_wc_conflict_choice_t        ConflictResolveCallback(const git_wc_conflict_description_t *description, CString& mergedfile);\r
        virtual BOOL                                            OnInitDialog();\r
        virtual BOOL                                            Cancel();\r
        virtual void                                            OnCancel();\r
@@ -202,7 +208,7 @@ protected:
        afx_msg BOOL    OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);\r
        afx_msg void    OnClose();\r
        afx_msg void    OnContextMenu(CWnd* pWnd, CPoint point);\r
-       afx_msg LRESULT OnSVNProgress(WPARAM wParam, LPARAM lParam);\r
+       afx_msg LRESULT OnGitProgress(WPARAM wParam, LPARAM lParam);\r
        afx_msg void    OnTimer(UINT_PTR nIDEvent);\r
        afx_msg void    OnEnSetfocusInfotext();\r
        afx_msg void    OnLvnBegindragSvnprogress(NMHDR *pNMHDR, LRESULT *pResult);\r
@@ -222,7 +228,7 @@ private:
        static UINT ProgressThreadEntry(LPVOID pVoid);\r
        UINT            ProgressThread();\r
        virtual void OnOK();\r
-       void            ReportSVNError();\r
+       void            ReportGitError();\r
        void            ReportError(const CString& sError);\r
        void            ReportWarning(const CString& sWarning);\r
        void            ReportNotification(const CString& sNotification);\r
@@ -259,7 +265,7 @@ private:
        bool            CmdUpdate(CString& sWindowTitle, bool& localoperation);\r
 \r
 private:\r
-       typedef std::map<CStringA, svn_revnum_t> StringRevMap;\r
+       typedef std::map<CStringA, git_revnum_t> StringRevMap;\r
        typedef std::vector<NotificationData *> NotificationDataVect;\r
 \r
 \r
@@ -273,23 +279,23 @@ private:
        CListCtrl                               m_ProgList;\r
        Command                                 m_Command;\r
        int                                             m_options;      // Use values from the ProgressOptions enum\r
-       svn_depth_t                             m_depth;\r
-       CTSVNPathList                   m_targetPathList;\r
-       CTSVNPathList                   m_selectedPaths;\r
-       CTSVNPath                               m_url;\r
-       CTSVNPath                               m_url2;\r
+       git_depth_t                             m_depth;\r
+       CTGitPathList                   m_targetPathList;\r
+       CTGitPathList                   m_selectedPaths;\r
+       CTGitPath                               m_url;\r
+       CTGitPath                               m_url2;\r
        CString                                 m_sMessage;\r
        CString                                 m_diffoptions;\r
-       SVNRev                                  m_Revision;\r
-       SVNRev                                  m_RevisionEnd;\r
-       SVNRev                                  m_pegRev;\r
-       SVNRevRangeArray                m_revisionArray;\r
+       GitRev                                  m_Revision;\r
+       GitRev                                  m_RevisionEnd;\r
+       GitRev                                  m_pegRev;\r
+//     GitRevRangeArray                m_revisionArray;\r
        CString                                 m_changelist;\r
        bool                                    m_keepchangelist;\r
 \r
        DWORD                                   m_dwCloseOnEnd;\r
 \r
-       CTSVNPath                               m_basePath;\r
+       CTGitPath                               m_basePath;\r
        StringRevMap                    m_UpdateStartRevMap;\r
        StringRevMap                    m_FinishedRevMap;\r
 \r
@@ -318,7 +324,7 @@ private:
 \r
        bool                                    m_AlwaysConflicted;\r
 \r
-       CComPtr<IBugTraqProvider> m_BugTraqProvider;\r
+///    CComPtr<IBugTraqProvider> m_BugTraqProvider;\r
 \r
        // some strings different methods can use\r
        CString                                 sIgnoredIncluded;\r

diff --git a/TortoiseProc/TortoiseProc.vcproj b/TortoiseProc/TortoiseProc.vcproj
index 0d1ecee..881368b 100644 (file)
--- a/TortoiseProc/TortoiseProc.vcproj
+++ b/TortoiseProc/TortoiseProc.vcproj
@@ -518,11 +518,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\copy.ico"\r
+                               RelativePath="..\Resources\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\copy.ico"\r
+                               RelativePath=".\copy.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -550,11 +550,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -762,19 +762,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -794,11 +794,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\refresh.ico"\r
+                               RelativePath="..\Resources\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\refresh.ico"\r
+                               RelativePath=".\refresh.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -874,11 +874,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -966,11 +966,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
@@ -1033,6 +1033,38 @@
                                        >\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="Blame"\r
+                               >\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Log"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\LogCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\LogCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\LogDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\LogDlg.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\LogDlgHelper.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\LogDlgHelper.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Utility Dialogs"\r

diff --git a/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user b/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
index 9a9e0c0..181890c 100644 (file)
--- a/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
+++ b/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
@@ -10,7 +10,7 @@
                        >\r
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
-                               WorkingDirectory=""\r
+                               WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
                                CommandArguments="/command:commit"\r
                                Attach="false"\r
                                DebuggerType="3"\r

diff --git a/TortoiseShell/ContextMenu.cpp b/TortoiseShell/ContextMenu.cpp
index b6b55b3..ae85bb8 100644 (file)
--- a/TortoiseShell/ContextMenu.cpp
+++ b/TortoiseShell/ContextMenu.cpp
@@ -146,8 +146,8 @@ CShellExt::MenuInfo CShellExt::menuInfo[] =
 //     { ShellMenuImport,                                              MENUIMPORT,                     IDI_IMPORT,                             IDS_MENUIMPORT,                         IDS_MENUDESCIMPORT,\r
 //     ITEMIS_FOLDER, ITEMIS_INSVN, 0, 0, 0, 0, 0, 0 },\r
 \r
-//     { ShellMenuBlame,                                               MENUBLAME,                      IDI_BLAME,                              IDS_MENUBLAME,                          IDS_MENUDESCBLAME,\r
-//     ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_FOLDER|ITEMIS_ADDED, 0, 0, 0, 0, 0, 0 },\r
+       { ShellMenuBlame,                                               MENUBLAME,                      IDI_BLAME,                              IDS_MENUBLAME,                          IDS_MENUDESCBLAME,\r
+       ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_FOLDER|ITEMIS_ADDED, 0, 0, 0, 0, 0, 0 },\r
 \r
 //     { ShellMenuIgnoreSub,                                   MENUIGNORE,                     IDI_IGNORE,                             IDS_MENUIGNORE,                         IDS_MENUDESCIGNORE,\r
 //     ITEMIS_INVERSIONEDFOLDER, ITEMIS_IGNORED|ITEMIS_INSVN, 0, 0, 0, 0, 0, 0 },\r

diff --git a/TortoiseShell/TortoiseShell.suo b/TortoiseShell/TortoiseShell.suo
index 5d52142..7374909 100644 (file)
Binary files a/TortoiseShell/TortoiseShell.suo and b/TortoiseShell/TortoiseShell.suo differ