-// 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
#include "TortoiseProc.h"\r
#include "CommitDlg.h"\r
#include "DirFileEnum.h"\r
-#include "SVNConfig.h"\r
-#include "SVNProperties.h"\r
+//#include "GitConfig.h"\r
+//#include "GitProperties.h"\r
#include "MessageBox.h"\r
#include "AppUtils.h"\r
#include "PathUtils.h"\r
-#include "SVN.h"\r
+//#include "Git.h"\r
#include "Registry.h"\r
-#include "SVNStatus.h"\r
+#include "GitStatus.h"\r
#include "HistoryDlg.h"\r
#include "Hooks.h"\r
\r
static char THIS_FILE[] = __FILE__;\r
#endif\r
\r
-UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(_T("TORTOISESVN_AUTOLISTREADY_MSG"));\r
+UINT CCommitDlg::WM_AUTOLISTREADY = RegisterWindowMessage(_T("TORTOISEGIT_AUTOLISTREADY_MSG"));\r
\r
IMPLEMENT_DYNAMIC(CCommitDlg, CResizableStandAloneDialog)\r
CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)\r
ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall)\r
ON_BN_CLICKED(IDHELP, OnBnClickedHelp)\r
ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)\r
- ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)\r
+// ON_BN_CLICKED(IDC_HISTORY, OnBnClickedHistory)\r
ON_BN_CLICKED(IDC_BUGTRAQBUTTON, OnBnClickedBugtraqbutton)\r
ON_EN_CHANGE(IDC_LOGMESSAGE, OnEnChangeLogmessage)\r
- ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnSVNStatusListCtrlItemCountChanged)\r
- ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
- ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)\r
- ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_CHECKCHANGED, &CCommitDlg::OnSVNStatusListCtrlCheckChanged)\r
+// ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnGitStatusListCtrlItemCountChanged)\r
+// ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnGitStatusListCtrlNeedsRefresh)\r
+// ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)\r
+// ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_CHECKCHANGED, &CCommitDlg::OnGitStatusListCtrlCheckChanged)\r
ON_REGISTERED_MESSAGE(WM_AUTOLISTREADY, OnAutoListReady) \r
ON_WM_TIMER()\r
ON_WM_SIZE()\r
{\r
CResizableStandAloneDialog::OnInitDialog();\r
\r
- m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseSVN\\AddBeforeCommit"), TRUE);\r
+ m_regAddBeforeCommit = CRegDWORD(_T("Software\\TortoiseGit\\AddBeforeCommit"), TRUE);\r
m_bShowUnversioned = m_regAddBeforeCommit;\r
\r
- m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseSVN\\MaxHistoryItems"), 25));\r
+ m_History.SetMaxHistoryItems((LONG)CRegDWORD(_T("Software\\TortoiseGit\\MaxHistoryItems"), 25));\r
\r
- m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseSVN\\KeepChangeLists"), FALSE);\r
+ m_regKeepChangelists = CRegDWORD(_T("Software\\TortoiseGit\\KeepChangeLists"), FALSE);\r
m_bKeepChangeList = m_regKeepChangelists;\r
\r
- SVNConfig config;\r
- m_bKeepLocks = config.KeepLocks();\r
+// GitConfig config;\r
+// m_bKeepLocks = config.KeepLocks();\r
\r
UpdateData(FALSE);\r
\r
- m_ListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLTEXTSTATUS | SVNSLC_COLPROPSTATUS | SVNSLC_COLLOCK, _T("CommitDlg"));\r
- m_ListCtrl.SetSelectButton(&m_SelectAll);\r
- m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));\r
- m_ListCtrl.SetCancelBool(&m_bCancelled);\r
- m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);\r
- m_ListCtrl.EnableFileDrop();\r
- m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);\r
+// m_ListCtrl.Init(GitSLC_COLEXT | GitSLC_COLTEXTSTATUS | GitSLC_COLPROPSTATUS | GitSLC_COLLOCK, _T("CommitDlg"));\r
+// m_ListCtrl.SetSelectButton(&m_SelectAll);\r
+// m_ListCtrl.SetStatLabel(GetDlgItem(IDC_STATISTICS));\r
+// m_ListCtrl.SetCancelBool(&m_bCancelled);\r
+// m_ListCtrl.SetEmptyString(IDS_COMMITDLG_NOTHINGTOCOMMIT);\r
+// m_ListCtrl.EnableFileDrop();\r
+// m_ListCtrl.SetBackgroundImage(IDI_COMMIT_BKG);\r
\r
- m_ProjectProperties.ReadPropsPathList(m_pathList);\r
+// m_ProjectProperties.ReadPropsPathList(m_pathList);\r
m_cLogMessage.Init(m_ProjectProperties);\r
- m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseSVN\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\LogFontSize"), 8));\r
+ m_cLogMessage.SetFont((CString)CRegString(_T("Software\\TortoiseGit\\LogFontName"), _T("Courier New")), (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\LogFontSize"), 8));\r
m_cLogMessage.RegisterContextMenuHandler(this);\r
\r
OnEnChangeLogmessage();\r
\r
m_tooltips.Create(this);\r
m_tooltips.AddTool(IDC_EXTERNALWARNING, IDS_COMMITDLG_EXTERNALS);\r
- m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);\r
+// m_tooltips.AddTool(IDC_HISTORY, IDS_COMMITDLG_HISTORY_TT);\r
\r
m_SelectAll.SetCheck(BST_INDETERMINATE);\r
- \r
+\r
+#if 0\r
CBugTraqAssociations bugtraq_associations;\r
bugtraq_associations.Load();\r
\r
GetDlgItem(IDC_BUGTRAQBUTTON)->EnableWindow(FALSE);\r
GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
}\r
-\r
+#endif\r
if (!m_sLogMessage.IsEmpty())\r
m_cLogMessage.SetText(m_sLogMessage);\r
\r
AddAnchor(IDC_BUGTRAQBUTTON, TOP_RIGHT);\r
AddAnchor(IDC_COMMIT_TO, TOP_LEFT, TOP_RIGHT);\r
AddAnchor(IDC_MESSAGEGROUP, TOP_LEFT, TOP_RIGHT);\r
- AddAnchor(IDC_HISTORY, TOP_LEFT);\r
+// AddAnchor(IDC_HISTORY, TOP_LEFT);\r
AddAnchor(IDC_LOGMESSAGE, TOP_LEFT, TOP_RIGHT);\r
\r
AddAnchor(IDC_LISTGROUP, TOP_LEFT, BOTTOM_RIGHT);\r
if (hWndExplorer)\r
CenterWindow(CWnd::FromHandle(hWndExplorer));\r
EnableSaveRestore(_T("CommitDlg"));\r
- DWORD yPos = CRegDWORD(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\CommitDlgSizer"));\r
+ DWORD yPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));\r
RECT rcDlg, rcLogMsg, rcFileList;\r
GetClientRect(&rcDlg);\r
m_cLogMessage.GetWindowRect(&rcLogMsg);\r
m_pThread->m_bAutoDelete = FALSE;\r
m_pThread->ResumeThread();\r
}\r
- CRegDWORD err = CRegDWORD(_T("Software\\TortoiseSVN\\ErrorOccurred"), FALSE);\r
- CRegDWORD historyhint = CRegDWORD(_T("Software\\TortoiseSVN\\HistoryHintShown"), FALSE);\r
+ CRegDWORD err = CRegDWORD(_T("Software\\TortoiseGit\\ErrorOccurred"), FALSE);\r
+ CRegDWORD historyhint = CRegDWORD(_T("Software\\TortoiseGit\\HistoryHintShown"), FALSE);\r
if ((((DWORD)err)!=FALSE)&&((((DWORD)historyhint)==FALSE)))\r
{\r
historyhint = TRUE;\r
- ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);\r
+// ShowBalloon(IDC_HISTORY, IDS_COMMITDLG_HISTORYHINT_TT, IDI_INFORMATION);\r
}\r
err = FALSE;\r
\r
return;\r
}\r
\r
- CRegDWORD regUnversionedRecurse (_T("Software\\TortoiseSVN\\UnversionedRecurse"), TRUE);\r
+#if 0\r
+ CRegDWORD regUnversionedRecurse (_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE);\r
if (!(DWORD)regUnversionedRecurse)\r
{\r
// Find unversioned directories which are marked for commit. The user might expect them\r
int nListItems = m_ListCtrl.GetItemCount();\r
for (int j=0; j<nListItems; j++)\r
{\r
- const CSVNStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);\r
- if (entry->IsChecked() && (entry->status == svn_wc_status_unversioned) && entry->IsFolder() )\r
+ const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);\r
+ if (entry->IsChecked() && (entry->status == Git_wc_status_unversioned) && entry->IsFolder() )\r
{\r
if (CMessageBox::Show(this->m_hWnd, IDS_COMMITDLG_UNVERSIONEDFOLDERWARNING, IDS_APPNAME, MB_YESNO | MB_ICONWARNING)!=IDYES)\r
return;\r
}\r
}\r
}\r
-\r
+#endif\r
m_pathwatcher.Stop();\r
InterlockedExchange(&m_bBlock, TRUE);\r
CDWordArray arDeleted;\r
m_bRecursive = true;\r
int nListItems = m_ListCtrl.GetItemCount();\r
\r
- CTSVNPathList itemsToAdd;\r
- CTSVNPathList itemsToRemove;\r
+ CTGitPathList itemsToAdd;\r
+ CTGitPathList itemsToRemove;\r
bool bCheckedInExternal = false;\r
bool bHasConflicted = false;\r
std::set<CString> checkedLists;\r
std::set<CString> uncheckedLists;\r
+#if 0\r
for (int j=0; j<nListItems; j++)\r
{\r
- const CSVNStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);\r
+ const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(j);\r
if (entry->IsChecked())\r
{\r
- if (entry->status == svn_wc_status_unversioned)\r
+ if (entry->status == Git_wc_status_unversioned)\r
{\r
itemsToAdd.AddPath(entry->GetPath());\r
}\r
- if (entry->status == svn_wc_status_conflicted)\r
+ if (entry->status == Git_wc_status_conflicted)\r
{\r
bHasConflicted = true;\r
}\r
- if (entry->status == svn_wc_status_missing)\r
+ if (entry->status == Git_wc_status_missing)\r
{\r
itemsToRemove.AddPath(entry->GetPath());\r
}\r
- if (entry->status == svn_wc_status_deleted)\r
+ if (entry->status == Git_wc_status_deleted)\r
{\r
arDeleted.Add(j);\r
}\r
}\r
else\r
{\r
- if ((entry->status != svn_wc_status_unversioned) &&\r
- (entry->status != svn_wc_status_ignored))\r
+ if ((entry->status != Git_wc_status_unversioned) &&\r
+ (entry->status != Git_wc_status_ignored))\r
{\r
nUnchecked++;\r
uncheckedLists.insert(entry->GetChangeList());\r
if (m_bRecursive)\r
{\r
- // This algorithm is for the sake of simplicity of the complexity O(N²)\r
+ // This algorithm is for the sake of simplicity of the complexity O(N?\r
for (int k=0; k<nListItems; k++)\r
{\r
- const CSVNStatusListCtrl::FileEntry * entryK = m_ListCtrl.GetListEntry(k);\r
+ const CGitStatusListCtrl::FileEntry * entryK = m_ListCtrl.GetListEntry(k);\r
if (entryK->IsChecked() && entryK->GetPath().IsAncestorOf(entry->GetPath()) )\r
{\r
// Fall back to a non-recursive commit to prevent items being\r
}\r
}\r
}\r
+#endif\r
+\r
+#if 0\r
if (m_pathwatcher.GetNumberOfChangedPaths() && m_bRecursive)\r
{\r
// There are paths which got changed (touched at least).\r
// We have to find out if this affects the selection in the commit dialog\r
// If it could affect the selection, revert back to a non-recursive commit\r
- CTSVNPathList changedList = m_pathwatcher.GetChangedPaths();\r
+ CTGitPathList changedList = m_pathwatcher.GetChangedPaths();\r
changedList.RemoveDuplicates();\r
for (int i=0; i<changedList.GetCount(); ++i)\r
{\r
else if (!m_ListCtrl.IsPathShown(changedList[i]))\r
{\r
// a path which is not shown in the list has changed\r
- CSVNStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(changedList[i]);\r
+ CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(changedList[i]);\r
if (entry)\r
{\r
// check if the changed path would get committed by a recursive commit\r
// Now, do all the adds - make sure that the list is sorted so that parents \r
// are added before their children\r
itemsToAdd.SortByPathname();\r
- SVN svn;\r
- if (!svn.Add(itemsToAdd, &m_ProjectProperties, svn_depth_empty, FALSE, FALSE, TRUE))\r
+ Git Git;\r
+ if (!Git.Add(itemsToAdd, &m_ProjectProperties, Git_depth_empty, FALSE, FALSE, TRUE))\r
{\r
- CMessageBox::Show(m_hWnd, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+ CMessageBox::Show(m_hWnd, Git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);\r
InterlockedExchange(&m_bBlock, FALSE);\r
Refresh();\r
return;\r
// Remove any missing items\r
// Not sure that this sort is really necessary - indeed, it might be better to do a reverse sort at this point\r
itemsToRemove.SortByPathname();\r
- svn.Remove(itemsToRemove, TRUE);\r
+ Git.Remove(itemsToRemove, TRUE);\r
\r
//the next step: find all deleted files and check if they're \r
//inside a deleted folder. If that's the case, then remove those\r
{\r
if (m_ListCtrl.GetCheck(arDeleted.GetAt(i)))\r
{\r
- const CTSVNPath& path = m_ListCtrl.GetListEntry(arDeleted.GetAt(i))->GetPath();\r
+ const CTGitPath& path = m_ListCtrl.GetListEntry(arDeleted.GetAt(i))->GetPath();\r
if (path.IsDirectory())\r
{\r
//now find all children of this directory\r
{\r
if (i!=j)\r
{\r
- CSVNStatusListCtrl::FileEntry* childEntry = m_ListCtrl.GetListEntry(arDeleted.GetAt(j));\r
+ CGitStatusListCtrl::FileEntry* childEntry = m_ListCtrl.GetListEntry(arDeleted.GetAt(j));\r
if (childEntry->IsChecked())\r
{\r
if (path.IsAncestorOf(childEntry->GetPath()))\r
if (uncheckedLists.find(*checkedLists.begin()) == uncheckedLists.end())\r
m_sChangeList = *checkedLists.begin();\r
}\r
+#endif\r
UpdateData();\r
m_regAddBeforeCommit = m_bShowUnversioned;\r
if (!GetDlgItem(IDC_KEEPLOCK)->IsWindowEnabled())\r
{\r
if (!IsIconic())\r
{\r
- CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseSVN\\TortoiseProc\\ResizableState\\CommitDlgSizer"));\r
+ CRegDWORD regPos = CRegDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\ResizableState\\CommitDlgSizer"));\r
RECT rectSplitter;\r
m_wndSplitter.GetWindowRect(&rectSplitter);\r
ScreenToClient(&rectSplitter);\r
\r
// read the list of recent log entries before querying the WC for status\r
// -> the user may select one and modify / update it while we are crawling the WC\r
+#if 0\r
if (m_History.GetCount()==0)\r
{\r
CString reg;\r
if (m_ListCtrl.m_sUUID.IsEmpty() && m_pathList.GetCount()>0)\r
{\r
- SVN svn;\r
- reg.Format(_T("Software\\TortoiseSVN\\History\\commit%s"), (LPCTSTR)svn.GetUUIDFromPath(m_pathList[0]));\r
+ Git Git;\r
+ reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)Git.GetUUIDFromPath(m_pathList[0]));\r
}\r
else\r
- reg.Format(_T("Software\\TortoiseSVN\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);\r
+ reg.Format(_T("Software\\TortoiseGit\\History\\commit%s"), (LPCTSTR)m_ListCtrl.m_sUUID);\r
m_History.Load(reg, _T("logmsgs"));\r
}\r
\r
BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
m_ListCtrl.CheckIfChangelistsArePresent(false);\r
\r
- DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWLOCKS | SVNSLC_SHOWINCHANGELIST;\r
- dwShow |= DWORD(m_regAddBeforeCommit) ? SVNSLC_SHOWUNVERSIONED : 0;\r
+ DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWLOCKS | GitSLC_SHOWINCHANGELIST;\r
+ dwShow |= DWORD(m_regAddBeforeCommit) ? GitSLC_SHOWUNVERSIONED : 0;\r
if (success)\r
{\r
if (m_checkedPathList.GetCount())\r
m_ListCtrl.Show(dwShow, m_checkedPathList);\r
else\r
{\r
- DWORD dwCheck = m_bSelectFilesForCommit ? SVNSLC_SHOWDIRECTS|SVNSLC_SHOWMODIFIED|SVNSLC_SHOWADDED|SVNSLC_SHOWREMOVED|SVNSLC_SHOWREPLACED|SVNSLC_SHOWMERGED|SVNSLC_SHOWLOCKS : 0;\r
+ DWORD dwCheck = m_bSelectFilesForCommit ? GitSLC_SHOWDIRECTS|GitSLC_SHOWMODIFIED|GitSLC_SHOWADDED|GitSLC_SHOWREMOVED|GitSLC_SHOWREPLACED|GitSLC_SHOWMERGED|GitSLC_SHOWLOCKS : 0;\r
m_ListCtrl.Show(dwShow, dwCheck);\r
m_bSelectFilesForCommit = true;\r
}\r
{\r
m_bShowUnversioned = TRUE;\r
GetDlgItem(IDC_SHOWUNVERSIONED)->SendMessage(BM_SETCHECK, BST_CHECKED);\r
- DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;\r
+ DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;\r
m_ListCtrl.Show(dwShow);\r
}\r
}\r
\r
- CTSVNPath commonDir = m_ListCtrl.GetCommonDirectory(false);\r
+ CTGitPath commonDir = m_ListCtrl.GetCommonDirectory(false);\r
SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());\r
\r
m_autolist.clear();\r
// auto completion list.\r
m_pathwatcher.ClearChangedPaths();\r
InterlockedExchange(&m_bBlock, FALSE);\r
- if ((DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\Autocompletion"), TRUE)==TRUE)\r
+ if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\Autocompletion"), TRUE)==TRUE)\r
{\r
m_ListCtrl.Block(TRUE, TRUE);\r
GetAutocompletionList();\r
InterlockedExchange(&m_bThreadRunning, FALSE);\r
// force the cursor to normal\r
RefreshCursor();\r
+#endif\r
return 0;\r
}\r
\r
state = BST_UNCHECKED;\r
m_SelectAll.SetCheck(state);\r
}\r
- m_ListCtrl.SelectAll(state == BST_CHECKED);\r
+// m_ListCtrl.SelectAll(state == BST_CHECKED);\r
}\r
\r
BOOL CCommitDlg::PreTranslateMessage(MSG* pMsg)\r
\r
void CCommitDlg::OnBnClickedShowunversioned()\r
{\r
+#if 0\r
m_tooltips.Pop(); // hide the tooltips\r
UpdateData();\r
m_regAddBeforeCommit = m_bShowUnversioned;\r
{\r
DWORD dwShow = m_ListCtrl.GetShowFlags();\r
if (DWORD(m_regAddBeforeCommit))\r
- dwShow |= SVNSLC_SHOWUNVERSIONED;\r
+ dwShow |= GitSLC_SHOWUNVERSIONED;\r
else\r
- dwShow &= ~SVNSLC_SHOWUNVERSIONED;\r
+ dwShow &= ~GitSLC_SHOWUNVERSIONED;\r
m_ListCtrl.Show(dwShow);\r
}\r
+#endif\r
}\r
\r
void CCommitDlg::OnStnClickedExternalwarning()\r
UpdateOKButton();\r
}\r
\r
-LRESULT CCommitDlg::OnSVNStatusListCtrlItemCountChanged(WPARAM, LPARAM)\r
+LRESULT CCommitDlg::OnGitStatusListCtrlItemCountChanged(WPARAM, LPARAM)\r
{\r
+#if 0\r
if ((m_ListCtrl.GetItemCount() == 0)&&(m_ListCtrl.HasUnversionedItems())&&(!m_bShowUnversioned))\r
{\r
if (CMessageBox::Show(*this, IDS_COMMITDLG_NOTHINGTOCOMMITUNVERSIONED, IDS_APPNAME, MB_ICONINFORMATION | MB_YESNO)==IDYES)\r
{\r
m_bShowUnversioned = TRUE;\r
- DWORD dwShow = SVNSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | SVNSLC_SHOWUNVERSIONED | SVNSLC_SHOWLOCKS;\r
+ DWORD dwShow = GitSLC_SHOWVERSIONEDBUTNORMALANDEXTERNALSFROMDIFFERENTREPOS | GitSLC_SHOWUNVERSIONED | GitSLC_SHOWLOCKS;\r
m_ListCtrl.Show(dwShow);\r
UpdateData(FALSE);\r
}\r
}\r
+#endif\r
return 0;\r
}\r
\r
-LRESULT CCommitDlg::OnSVNStatusListCtrlNeedsRefresh(WPARAM, LPARAM)\r
+LRESULT CCommitDlg::OnGitStatusListCtrlNeedsRefresh(WPARAM, LPARAM)\r
{\r
Refresh();\r
return 0;\r
\r
LRESULT CCommitDlg::OnFileDropped(WPARAM, LPARAM lParam)\r
{\r
+#if 0\r
BringWindowToTop();\r
SetForegroundWindow();\r
SetActiveWindow();\r
// When the timer expires, we start the refresh thread,\r
// but only if it isn't already running - otherwise we\r
// restart the timer.\r
- CTSVNPath path;\r
+ CTGitPath path;\r
path.SetFromWin((LPCTSTR)lParam);\r
\r
// just add all the items we get here.\r
// if the item is versioned, the add will fail but nothing\r
// more will happen.\r
- SVN svn;\r
- svn.Add(CTSVNPathList(path), &m_ProjectProperties, svn_depth_empty, false, true, true);\r
+ Git Git;\r
+ Git.Add(CTGitPathList(path), &m_ProjectProperties, Git_depth_empty, false, true, true);\r
\r
if (!m_ListCtrl.HasPath(path))\r
{\r
// Always start the timer, since the status of an existing item might have changed\r
SetTimer(REFRESHTIMER, 200, NULL);\r
ATLTRACE(_T("Item %s dropped, timer started\n"), path.GetWinPath());\r
+#endif\r
return 0;\r
}\r
\r
\r
std::map<CString, CString> mapRegex;\r
CString sRegexFile = CPathUtils::GetAppDirectory();\r
- CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseSVN\\AutocompleteParseTimeout"), 5);\r
+ CRegDWORD regtimeout = CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteParseTimeout"), 5);\r
DWORD timeoutvalue = regtimeout*1000;\r
sRegexFile += _T("autolist.txt");\r
if (!m_bRunThread)\r
ParseRegexFile(sRegexFile, mapRegex);\r
SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, sRegexFile.GetBuffer(MAX_PATH+1));\r
sRegexFile.ReleaseBuffer();\r
- sRegexFile += _T("\\TortoiseSVN\\autolist.txt");\r
+ sRegexFile += _T("\\TortoiseGit\\autolist.txt");\r
if (PathFileExists(sRegexFile))\r
{\r
ParseRegexFile(sRegexFile, mapRegex);\r
// stop parsing after timeout\r
if ((!m_bRunThread) || (GetTickCount() - starttime > timeoutvalue))\r
return;\r
- const CSVNStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);\r
- if (!entry)\r
- continue;\r
+\r
+// const CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);\r
+// if (!entry)\r
+// continue;\r
\r
// add the path parts to the auto completion list too\r
- CString sPartPath = entry->GetRelativeSVNPath();\r
- m_autolist.insert(sPartPath);\r
+// CString sPartPath = entry->GetRelativeGitPath();\r
+// m_autolist.insert(sPartPath);\r
\r
+#if 0\r
int pos = 0;\r
int lastPos = 0;\r
while ((pos = sPartPath.Find('/', pos)) >= 0)\r
\r
// Last inserted entry is a file name.\r
// Some users prefer to also list file name without extension.\r
- if (CRegDWORD(_T("Software\\TortoiseSVN\\AutocompleteRemovesExtensions"), FALSE))\r
+ if (CRegDWORD(_T("Software\\TortoiseGit\\AutocompleteRemovesExtensions"), FALSE))\r
{\r
int dotPos = sPartPath.ReverseFind('.');\r
if ((dotPos >= 0) && (dotPos > lastPos))\r
m_autolist.insert(sPartPath.Mid(lastPos, dotPos - lastPos));\r
}\r
\r
- if ((entry->status <= svn_wc_status_normal)||(entry->status == svn_wc_status_ignored))\r
+ if ((entry->status <= Git_wc_status_normal)||(entry->status == Git_wc_status_ignored))\r
continue;\r
\r
CString sExt = entry->GetPath().GetFileExtension();\r
continue;\r
\r
ScanFile(entry->GetPath().GetWinPathString(), rdata);\r
- if ((entry->textstatus != svn_wc_status_unversioned) &&\r
- (entry->textstatus != svn_wc_status_none) &&\r
- (entry->textstatus != svn_wc_status_ignored) &&\r
- (entry->textstatus != svn_wc_status_added) &&\r
- (entry->textstatus != svn_wc_status_normal))\r
+ if ((entry->textstatus != Git_wc_status_unversioned) &&\r
+ (entry->textstatus != Git_wc_status_none) &&\r
+ (entry->textstatus != Git_wc_status_ignored) &&\r
+ (entry->textstatus != Git_wc_status_added) &&\r
+ (entry->textstatus != Git_wc_status_normal))\r
{\r
- CTSVNPath basePath = SVN::GetPristinePath(entry->GetPath());\r
+ CTGitPath basePath = Git::GetPristinePath(entry->GetPath());\r
if (!basePath.IsEmpty())\r
ScanFile(basePath.GetWinPathString(), rdata);\r
}\r
+#endif\r
}\r
ATLTRACE(_T("Auto completion list loaded in %d msec\n"), GetTickCount() - starttime);\r
}\r
\r
bool CCommitDlg::HandleMenuItemClick(int cmd, CSciEdit * pSciEdit)\r
{\r
+#if 0\r
if (m_bBlock)\r
return false;\r
if (cmd == m_nPopupPasteListCmd)\r
int nListItems = m_ListCtrl.GetItemCount();\r
for (int i=0; i<nListItems; ++i)\r
{\r
- CSVNStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);\r
+ CGitStatusListCtrl::FileEntry * entry = m_ListCtrl.GetListEntry(i);\r
if (entry->IsChecked())\r
{\r
CString line;\r
- svn_wc_status_kind status = entry->status;\r
- if (status == svn_wc_status_unversioned)\r
- status = svn_wc_status_added;\r
- if (status == svn_wc_status_missing)\r
- status = svn_wc_status_deleted;\r
- WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());\r
+ Git_wc_status_kind status = entry->status;\r
+ if (status == Git_wc_status_unversioned)\r
+ status = Git_wc_status_added;\r
+ if (status == Git_wc_status_missing)\r
+ status = Git_wc_status_deleted;\r
+ WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());\r
if (m_ProjectProperties.bFileListInEnglish)\r
langID = 1033;\r
- SVNStatus::GetStatusString(AfxGetResourceHandle(), status, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
+ GitStatus::GetStatusString(AfxGetResourceHandle(), status, buf, sizeof(buf)/sizeof(TCHAR), langID);\r
line.Format(_T("%-10s %s\r\n"), buf, (LPCTSTR)m_ListCtrl.GetItemText(i,0));\r
logmsg += line;\r
}\r
pSciEdit->InsertText(logmsg);\r
return true;\r
}\r
+#endif\r
return false;\r
}\r
\r
m_tooltips.Pop(); // hide the tooltips\r
if (m_pathList.GetCount() == 0)\r
return;\r
+#if 0\r
CHistoryDlg historyDlg;\r
historyDlg.SetHistory(m_History);\r
if (historyDlg.DoModal() != IDOK)\r
\r
UpdateOKButton();\r
GetDlgItem(IDC_LOGMESSAGE)->SetFocus();\r
+#endif\r
}\r
\r
void CCommitDlg::OnBnClickedBugtraqbutton()\r
{\r
+#if 0\r
m_tooltips.Pop(); // hide the tooltips\r
CString sMsg = m_cLogMessage.GetText();\r
\r
SAFEARRAY *pathList = SafeArrayCreateVector(VT_BSTR, 0, m_pathList.GetCount());\r
\r
for (LONG index = 0; index < m_pathList.GetCount(); ++index)\r
- SafeArrayPutElement(pathList, &index, m_pathList[index].GetSVNPathString().AllocSysString());\r
+ SafeArrayPutElement(pathList, &index, m_pathList[index].GetGitPathString().AllocSysString());\r
\r
BSTR originalMessage = sMsg.AllocSysString();\r
BSTR temp = NULL;\r
HRESULT hr = m_BugTraqProvider.QueryInterface(&pProvider2);\r
if (SUCCEEDED(hr))\r
{\r
- CString common = m_ListCtrl.GetCommonURL(false).GetSVNPathString();\r
+ CString common = m_ListCtrl.GetCommonURL(false).GetGitPathString();\r
BSTR repositoryRoot = common.AllocSysString();\r
if (FAILED(hr = pProvider2->GetCommitMessage2(GetSafeHwnd(), parameters, repositoryRoot, commonRoot, pathList, originalMessage, &temp)))\r
{\r
CString sErr;\r
sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
- CMessageBox::Show(m_hWnd, sErr, _T("TortoiseSVN"), MB_ICONERROR);\r
+ CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
}\r
else\r
m_cLogMessage.SetText(temp);\r
{\r
CString sErr;\r
sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, (LPCTSTR)m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
- CMessageBox::Show(m_hWnd, sErr, _T("TortoiseSVN"), MB_ICONERROR);\r
+ CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
return;\r
}\r
\r
{\r
CString sErr;\r
sErr.Format(IDS_ERR_FAILEDISSUETRACKERCOM, m_bugtraq_association.GetProviderName(), _com_error(hr).ErrorMessage());\r
- CMessageBox::Show(m_hWnd, sErr, _T("TortoiseSVN"), MB_ICONERROR);\r
+ CMessageBox::Show(m_hWnd, sErr, _T("TortoiseGit"), MB_ICONERROR);\r
}\r
else\r
m_cLogMessage.SetText(temp);\r
m_cLogMessage.SetFocus();\r
\r
SysFreeString(temp);\r
+#endif\r
}\r
\r
-LRESULT CCommitDlg::OnSVNStatusListCtrlCheckChanged(WPARAM, LPARAM)\r
+LRESULT CCommitDlg::OnGitStatusListCtrlCheckChanged(WPARAM, LPARAM)\r
{\r
UpdateOKButton();\r
return 0;\r
\r
void CCommitDlg::UpdateOKButton()\r
{\r
+#if 0\r
BOOL bValidLogSize = FALSE;\r
\r
if (m_cLogMessage.GetText().GetLength() >= m_ProjectProperties.nMinLogSize)\r
\r
LONG nSelectedItems = m_ListCtrl.GetSelected();\r
DialogEnableWindow(IDOK, bValidLogSize && nSelectedItems>0);\r
+#endif\r
}\r
\r
\r
OSDN Git Service
