#include "messagebox.h"\r
#include "SVNProgressDlg.h"\r
#include "LogDlg.h"\r
-#include "TSVNPath.h"\r
+#include "TGitPath.h"\r
#include "Registry.h"\r
-#include "SVNStatus.h"\r
+#include "GitStatus.h"\r
#include "AppUtils.h"\r
#include "PathUtils.h"\r
#include "StringUtils.h"\r
#include "TempFile.h"\r
#include "UnicodeUtils.h"\r
#include "SoundUtils.h"\r
-#include "SVNDiff.h"\r
+#include "GitDiff.h"\r
#include "Hooks.h"\r
#include "DropFiles.h"\r
-#include "SVNLogHelper.h"\r
+//#include "GitLogHelper.h"\r
#include "RegHistory.h"\r
-#include "ConflictResolveDlg.h"\r
+//#include "ConflictResolveDlg.h"\r
#include "LogFile.h"\r
#include "ShellUpdater.h"\r
#include "IconMenu.h"\r
#include "BugTraqAssociations.h"\r
\r
\r
-BOOL CSVNProgressDlg::m_bAscending = FALSE;\r
-int CSVNProgressDlg::m_nSortedColumn = -1;\r
+BOOL CGitProgressDlg::m_bAscending = FALSE;\r
+int CGitProgressDlg::m_nSortedColumn = -1;\r
\r
#define TRANSFERTIMER 100\r
#define VISIBLETIMER 101\r
ID_COPY\r
};\r
\r
-IMPLEMENT_DYNAMIC(CSVNProgressDlg, CResizableStandAloneDialog)\r
-CSVNProgressDlg::CSVNProgressDlg(CWnd* pParent /*=NULL*/)\r
- : CResizableStandAloneDialog(CSVNProgressDlg::IDD, pParent)\r
+IMPLEMENT_DYNAMIC(CGitProgressDlg, CResizableStandAloneDialog)\r
+CGitProgressDlg::CGitProgressDlg(CWnd* pParent /*=NULL*/)\r
+ : CResizableStandAloneDialog(CGitProgressDlg::IDD, pParent)\r
+#if 0\r
, m_Revision(_T("HEAD"))\r
- , m_RevisionEnd(0)\r
+ //, m_RevisionEnd(0)\r
, m_bLockWarning(false)\r
, m_bLockExists(false)\r
, m_bCancelled(FALSE)\r
, m_dwCloseOnEnd((DWORD)-1)\r
, m_bFinishedItemAdded(false)\r
, m_bLastVisible(false)\r
- , m_depth(svn_depth_unknown)\r
+// , m_depth(svn_depth_unknown)\r
, m_itemCount(-1)\r
, m_itemCountTotal(-1)\r
, m_AlwaysConflicted(false)\r
, sRespectAncestry(MAKEINTRESOURCE(IDS_PROGRS_RESPECTANCESTRY))\r
, sDryRun(MAKEINTRESOURCE(IDS_PROGRS_DRYRUN))\r
, sRecordOnly(MAKEINTRESOURCE(IDS_MERGE_RECORDONLY))\r
+#endif\r
{\r
}\r
\r
-CSVNProgressDlg::~CSVNProgressDlg()\r
+CGitProgressDlg::~CGitProgressDlg()\r
{\r
for (size_t i=0; i<m_arData.size(); i++)\r
{\r
}\r
}\r
\r
-void CSVNProgressDlg::DoDataExchange(CDataExchange* pDX)\r
+void CGitProgressDlg::DoDataExchange(CDataExchange* pDX)\r
{\r
CResizableStandAloneDialog::DoDataExchange(pDX);\r
DDX_Control(pDX, IDC_SVNPROGRESS, m_ProgList);\r
}\r
\r
-BEGIN_MESSAGE_MAP(CSVNProgressDlg, CResizableStandAloneDialog)\r
+BEGIN_MESSAGE_MAP(CGitProgressDlg, CResizableStandAloneDialog)\r
ON_BN_CLICKED(IDC_LOGBUTTON, OnBnClickedLogbutton)\r
ON_NOTIFY(NM_CUSTOMDRAW, IDC_SVNPROGRESS, OnNMCustomdrawSvnprogress)\r
ON_WM_CLOSE()\r
ON_WM_CONTEXTMENU()\r
ON_REGISTERED_MESSAGE(WM_SVNPROGRESS, OnSVNProgress)\r
ON_WM_TIMER()\r
- ON_EN_SETFOCUS(IDC_INFOTEXT, &CSVNProgressDlg::OnEnSetfocusInfotext)\r
- ON_NOTIFY(LVN_BEGINDRAG, IDC_SVNPROGRESS, &CSVNProgressDlg::OnLvnBegindragSvnprogress)\r
+ ON_EN_SETFOCUS(IDC_INFOTEXT, &CGitProgressDlg::OnEnSetfocusInfotext)\r
+ ON_NOTIFY(LVN_BEGINDRAG, IDC_SVNPROGRESS, &CGitProgressDlg::OnLvnBegindragSvnprogress)\r
ON_WM_SIZE()\r
- ON_NOTIFY(LVN_GETDISPINFO, IDC_SVNPROGRESS, &CSVNProgressDlg::OnLvnGetdispinfoSvnprogress)\r
- ON_BN_CLICKED(IDC_NONINTERACTIVE, &CSVNProgressDlg::OnBnClickedNoninteractive)\r
+ ON_NOTIFY(LVN_GETDISPINFO, IDC_SVNPROGRESS, &CGitProgressDlg::OnLvnGetdispinfoSvnprogress)\r
+ ON_BN_CLICKED(IDC_NONINTERACTIVE, &CGitProgressDlg::OnBnClickedNoninteractive)\r
ON_MESSAGE(WM_SHOWCONFLICTRESOLVER, OnShowConflictResolver)\r
END_MESSAGE_MAP()\r
\r
-BOOL CSVNProgressDlg::Cancel()\r
+BOOL CGitProgressDlg::Cancel()\r
{\r
return m_bCancelled;\r
}\r
\r
-LRESULT CSVNProgressDlg::OnShowConflictResolver(WPARAM /*wParam*/, LPARAM lParam)\r
+LRESULT CGitProgressDlg::OnShowConflictResolver(WPARAM /*wParam*/, LPARAM lParam)\r
{\r
CConflictResolveDlg dlg(this);\r
const svn_wc_conflict_description_t *description = (svn_wc_conflict_description_t *)lParam;\r
return svn_wc_conflict_choose_postpone;\r
}\r
\r
-svn_wc_conflict_choice_t CSVNProgressDlg::ConflictResolveCallback(const svn_wc_conflict_description_t *description, CString& mergedfile)\r
+svn_wc_conflict_choice_t CGitProgressDlg::ConflictResolveCallback(const svn_wc_conflict_description_t *description, CString& mergedfile)\r
{\r
// we only bother the user when merging\r
if (((m_Command == SVNProgress_Merge)||(m_Command == SVNProgress_MergeAll)||(m_Command == SVNProgress_MergeReintegrate))&&(!m_AlwaysConflicted)&&(description))\r
return svn_wc_conflict_choose_postpone;\r
}\r
\r
-void CSVNProgressDlg::AddItemToList()\r
+void CGitProgressDlg::AddItemToList()\r
{\r
int totalcount = m_ProgList.GetItemCount();\r
\r
}\r
}\r
\r
-BOOL CSVNProgressDlg::Notify(const CTSVNPath& path, svn_wc_notify_action_t action, \r
+BOOL CGitProgressDlg::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
return TRUE;\r
}\r
\r
-CString CSVNProgressDlg::BuildInfoString()\r
+CString CGitProgressDlg::BuildInfoString()\r
{\r
CString infotext;\r
CString temp;\r
return infotext;\r
}\r
\r
-void CSVNProgressDlg::SetSelectedList(const CTSVNPathList& selPaths)\r
+void CGitProgressDlg::SetSelectedList(const CTSVNPathList& selPaths)\r
{\r
m_selectedPaths = selPaths;\r
}\r
\r
-void CSVNProgressDlg::ResizeColumns()\r
+void CGitProgressDlg::ResizeColumns()\r
{\r
m_ProgList.SetRedraw(FALSE);\r
\r
m_ProgList.SetRedraw(TRUE); \r
}\r
\r
-BOOL CSVNProgressDlg::OnInitDialog()\r
+BOOL CGitProgressDlg::OnInitDialog()\r
{\r
__super::OnInitDialog();\r
\r
return TRUE;\r
}\r
\r
-bool CSVNProgressDlg::SetBackgroundImage(UINT nID)\r
+bool CGitProgressDlg::SetBackgroundImage(UINT nID)\r
{\r
return CAppUtils::SetListCtrlBackgroundImage(m_ProgList.GetSafeHwnd(), nID);\r
}\r
\r
-void CSVNProgressDlg::ReportSVNError()\r
+void CGitProgressDlg::ReportSVNError()\r
{\r
ReportError(GetLastErrorMessage());\r
}\r
\r
-void CSVNProgressDlg::ReportError(const CString& sError)\r
+void CGitProgressDlg::ReportError(const CString& sError)\r
{\r
CSoundUtils::PlayTSVNError();\r
ReportString(sError, CString(MAKEINTRESOURCE(IDS_ERR_ERROR)), m_Colors.GetColor(CColors::Conflict));\r
m_bErrorsOccurred = true;\r
}\r
\r
-void CSVNProgressDlg::ReportWarning(const CString& sWarning)\r
+void CGitProgressDlg::ReportWarning(const CString& sWarning)\r
{\r
CSoundUtils::PlayTSVNWarning();\r
ReportString(sWarning, CString(MAKEINTRESOURCE(IDS_WARN_WARNING)), m_Colors.GetColor(CColors::Conflict));\r
}\r
\r
-void CSVNProgressDlg::ReportNotification(const CString& sNotification)\r
+void CGitProgressDlg::ReportNotification(const CString& sNotification)\r
{\r
CSoundUtils::PlayTSVNNotification();\r
ReportString(sNotification, CString(MAKEINTRESOURCE(IDS_WARN_NOTE)));\r
}\r
\r
-void CSVNProgressDlg::ReportCmd(const CString& sCmd)\r
+void CGitProgressDlg::ReportCmd(const CString& sCmd)\r
{\r
ReportString(sCmd, CString(MAKEINTRESOURCE(IDS_PROGRS_CMDINFO)), m_Colors.GetColor(CColors::Cmd));\r
}\r
\r
-void CSVNProgressDlg::ReportString(CString sMessage, const CString& sMsgKind, COLORREF color)\r
+void CGitProgressDlg::ReportString(CString sMessage, const CString& sMsgKind, COLORREF color)\r
{\r
// instead of showing a dialog box with the error message or notification,\r
// just insert the error text into the list control.\r
}\r
}\r
\r
-UINT CSVNProgressDlg::ProgressThreadEntry(LPVOID pVoid)\r
+UINT CGitProgressDlg::ProgressThreadEntry(LPVOID pVoid)\r
{\r
- return ((CSVNProgressDlg*)pVoid)->ProgressThread();\r
+ return ((CGitProgressDlg*)pVoid)->ProgressThread();\r
}\r
\r
-UINT CSVNProgressDlg::ProgressThread()\r
+UINT CGitProgressDlg::ProgressThread()\r
{\r
// The SetParams function should have loaded something for us\r
\r
InterlockedExchange(&m_bThreadRunning, FALSE);\r
RefreshCursor();\r
\r
- DWORD dwAutoClose = CRegStdWORD(_T("Software\\TortoiseSVN\\AutoClose"));\r
+ DWORD dwAutoClose = CRegStdWORD(_T("Software\\TortoiseGit\\AutoClose"));\r
if (m_options & ProgOptDryRun)\r
dwAutoClose = 0; // dry run means progress dialog doesn't auto close at all\r
if (!m_bLastVisible)\r
return 0;\r
}\r
\r
-void CSVNProgressDlg::OnBnClickedLogbutton()\r
+void CGitProgressDlg::OnBnClickedLogbutton()\r
{\r
if (m_targetPathList.GetCount() != 1)\r
return;\r
}\r
\r
\r
-void CSVNProgressDlg::OnClose()\r
+void CGitProgressDlg::OnClose()\r
{\r
if (m_bCancelled)\r
{\r
__super::OnClose();\r
}\r
\r
-void CSVNProgressDlg::OnOK()\r
+void CGitProgressDlg::OnOK()\r
{\r
if ((m_bCancelled)&&(!m_bThreadRunning))\r
{\r
m_bCancelled = TRUE;\r
}\r
\r
-void CSVNProgressDlg::OnCancel()\r
+void CGitProgressDlg::OnCancel()\r
{\r
if ((m_bCancelled)&&(!m_bThreadRunning))\r
__super::OnCancel();\r
m_bCancelled = TRUE;\r
}\r
\r
-void CSVNProgressDlg::OnLvnGetdispinfoSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)\r
+void CGitProgressDlg::OnLvnGetdispinfoSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)\r
{\r
NMLVDISPINFO *pDispInfo = reinterpret_cast<NMLVDISPINFO*>(pNMHDR);\r
\r
*pResult = 0;\r
}\r
\r
-void CSVNProgressDlg::OnNMCustomdrawSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)\r
+void CGitProgressDlg::OnNMCustomdrawSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)\r
{\r
NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );\r
\r
}\r
}\r
\r
-void CSVNProgressDlg::OnNMDblclkSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)\r
+void CGitProgressDlg::OnNMDblclkSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)\r
{\r
LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
*pResult = 0;\r
}\r
}\r
\r
-void CSVNProgressDlg::OnHdnItemclickSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)\r
+void CGitProgressDlg::OnHdnItemclickSvnprogress(NMHDR *pNMHDR, LRESULT *pResult)\r
{\r
LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);\r
if (m_bThreadRunning)\r
*pResult = 0;\r
}\r
\r
-bool CSVNProgressDlg::NotificationDataIsAux(const NotificationData* pData)\r
+bool CGitProgressDlg::NotificationDataIsAux(const NotificationData* pData)\r
{\r
return pData->bAuxItem;\r
}\r
\r
-LRESULT CSVNProgressDlg::OnSVNProgress(WPARAM /*wParam*/, LPARAM lParam)\r
+LRESULT CGitProgressDlg::OnSVNProgress(WPARAM /*wParam*/, LPARAM lParam)\r
{\r
SVNProgress * pProgressData = (SVNProgress *)lParam;\r
CProgressCtrl * progControl = (CProgressCtrl *)GetDlgItem(IDC_PROGRESSBAR);\r
return 0;\r
}\r
\r
-void CSVNProgressDlg::OnTimer(UINT_PTR nIDEvent)\r
+void CGitProgressDlg::OnTimer(UINT_PTR nIDEvent)\r
{\r
if (nIDEvent == TRANSFERTIMER)\r
{\r
}\r
}\r
\r
-void CSVNProgressDlg::Sort()\r
+void CGitProgressDlg::Sort()\r
{\r
if(m_arData.size() < 2)\r
{\r
for(;;)\r
{\r
// Search to the start of the non-aux entry in the next block\r
- actionBlockBegin = std::find_if(actionBlockEnd, m_arData.end(), std::not1(std::ptr_fun(&CSVNProgressDlg::NotificationDataIsAux)));\r
+ actionBlockBegin = std::find_if(actionBlockEnd, m_arData.end(), std::not1(std::ptr_fun(&CGitProgressDlg::NotificationDataIsAux)));\r
if(actionBlockBegin == m_arData.end())\r
{\r
// There are no more actions\r
break;\r
}\r
// Now search to find the end of the block\r
- actionBlockEnd = std::find_if(actionBlockBegin+1, m_arData.end(), std::ptr_fun(&CSVNProgressDlg::NotificationDataIsAux));\r
+ actionBlockEnd = std::find_if(actionBlockBegin+1, m_arData.end(), std::ptr_fun(&CGitProgressDlg::NotificationDataIsAux));\r
// Now sort the block\r
- std::sort(actionBlockBegin, actionBlockEnd, &CSVNProgressDlg::SortCompare);\r
+ std::sort(actionBlockBegin, actionBlockEnd, &CGitProgressDlg::SortCompare);\r
}\r
}\r
\r
-bool CSVNProgressDlg::SortCompare(const NotificationData * pData1, const NotificationData * pData2)\r
+bool CGitProgressDlg::SortCompare(const NotificationData * pData1, const NotificationData * pData2)\r
{\r
int result = 0;\r
switch (m_nSortedColumn)\r
return result < 0;\r
}\r
\r
-BOOL CSVNProgressDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)\r
+BOOL CGitProgressDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)\r
{\r
if (!GetDlgItem(IDOK)->IsWindowEnabled())\r
{\r
return CResizableStandAloneDialog::OnSetCursor(pWnd, nHitTest, message);\r
}\r
\r
-BOOL CSVNProgressDlg::PreTranslateMessage(MSG* pMsg)\r
+BOOL CGitProgressDlg::PreTranslateMessage(MSG* pMsg)\r
{\r
if (pMsg->message == WM_KEYDOWN)\r
{\r
return __super::PreTranslateMessage(pMsg);\r
}\r
\r
-void CSVNProgressDlg::OnContextMenu(CWnd* pWnd, CPoint point)\r
+void CGitProgressDlg::OnContextMenu(CWnd* pWnd, CPoint point)\r
{\r
if (m_options & ProgOptDryRun)\r
return; // don't do anything in a dry-run.\r
break;\r
}\r
// If necessary, convert the line-endings on the file before diffing\r
- if ((DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\ConvertBase"), TRUE))\r
+ if ((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\ConvertBase"), TRUE))\r
{\r
CTSVNPath temporaryFile = CTempFiles::Instance().GetTempFilePath(false, data->path, SVNRev::REV_BASE);\r
if (!svn.Cat(data->path, SVNRev(SVNRev::REV_BASE), SVNRev(SVNRev::REV_BASE), temporaryFile))\r
break;\r
case ID_LOG:\r
{\r
- CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+ CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
int limit = (int)(DWORD)reg;\r
svn_revnum_t rev = m_RevisionEnd;\r
if (!data->basepath.IsEmpty())\r
}\r
}\r
\r
-void CSVNProgressDlg::OnEnSetfocusInfotext()\r
+void CGitProgressDlg::OnEnSetfocusInfotext()\r
{\r
CString sTemp;\r
GetDlgItemText(IDC_INFOTEXT, sTemp);\r
GetDlgItem(IDC_INFOTEXT)->HideCaret();\r
}\r
\r
-void CSVNProgressDlg::OnLvnBegindragSvnprogress(NMHDR* , LRESULT *pResult)\r
+void CGitProgressDlg::OnLvnBegindragSvnprogress(NMHDR* , LRESULT *pResult)\r
{\r
//LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);\r
\r
*pResult = 0;\r
}\r
\r
-void CSVNProgressDlg::OnSize(UINT nType, int cx, int cy)\r
+void CGitProgressDlg::OnSize(UINT nType, int cx, int cy)\r
{\r
CResizableStandAloneDialog::OnSize(nType, cx, cy);\r
if ((nType == SIZE_RESTORED)&&(m_bLastVisible))\r
//////////////////////////////////////////////////////////////////////////\r
/// commands\r
//////////////////////////////////////////////////////////////////////////\r
-bool CSVNProgressDlg::CmdAdd(CString& sWindowTitle, bool& localoperation)\r
+bool CGitProgressDlg::CmdAdd(CString& sWindowTitle, bool& localoperation)\r
{\r
localoperation = true;\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_ADD);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdCheckout(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdCheckout(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
ASSERT(m_targetPathList.GetCount() == 1);\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_CHECKOUT);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdCommit(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdCommit(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_COMMIT);\r
SetWindowText(sWindowTitle);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdCopy(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdCopy(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
ASSERT(m_targetPathList.GetCount() == 1);\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_COPY);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdExport(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdExport(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
ASSERT(m_targetPathList.GetCount() == 1);\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_EXPORT);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdImport(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdImport(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
ASSERT(m_targetPathList.GetCount() == 1);\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_IMPORT);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdLock(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdLock(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_LOCK);\r
SetWindowText(sWindowTitle);\r
// if the locking-dialog is skipped in the settings, tell the\r
// user how to steal the lock anyway (i.e., how to get the lock\r
// dialog back without changing the settings)\r
- if (!DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\ShowLockDlg"), TRUE)))\r
+ if (!DWORD(CRegDWORD(_T("Software\\TortoiseGit\\ShowLockDlg"), TRUE)))\r
{\r
ReportString(CString(MAKEINTRESOURCE(IDS_SVNPROGRESS_LOCKHINT)), CString(MAKEINTRESOURCE(IDS_WARN_NOTE)));\r
}\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdMerge(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdMerge(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
bool bFailed = false;\r
ASSERT(m_targetPathList.GetCount() == 1);\r
\r
GetDlgItem(IDC_INFOTEXT)->ShowWindow(SW_HIDE);\r
GetDlgItem(IDC_NONINTERACTIVE)->ShowWindow(SW_SHOW);\r
- CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseSVN\\MergeNonInteractive"), FALSE);\r
+ CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);\r
if (DWORD(nonint))\r
{\r
::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_SETCHECK, BST_CHECKED, 0);\r
{\r
CString sSuggestedMessage;\r
CString sMergedLogMessage;\r
- CString sSeparator = CRegString(_T("Software\\TortoiseSVN\\MergeLogSeparator"), _T("........"));\r
+ CString sSeparator = CRegString(_T("Software\\TortoiseGit\\MergeLogSeparator"), _T("........"));\r
CString temp;\r
\r
// Merging revisions %s of %s to %s into %s, %s%s\r
return !bFailed;\r
}\r
\r
-bool CSVNProgressDlg::CmdMergeAll(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdMergeAll(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
ASSERT(m_targetPathList.GetCount() == 1);\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_MERGE);\r
ReportCmd(sCmdInfo);\r
\r
GetDlgItem(IDC_NONINTERACTIVE)->ShowWindow(SW_SHOW);\r
- CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseSVN\\MergeNonInteractive"), FALSE);\r
+ CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);\r
if (DWORD(nonint))\r
{\r
::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_SETCHECK, BST_CHECKED, 0);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdMergeReintegrate(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdMergeReintegrate(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
ASSERT(m_targetPathList.GetCount() == 1);\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_MERGEREINTEGRATE);\r
ReportCmd(sCmdInfo);\r
\r
GetDlgItem(IDC_NONINTERACTIVE)->ShowWindow(SW_SHOW);\r
- CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseSVN\\MergeNonInteractive"), FALSE);\r
+ CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);\r
if (DWORD(nonint))\r
{\r
::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_SETCHECK, BST_CHECKED, 0);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdRename(CString& sWindowTitle, bool& localoperation)\r
+bool CGitProgressDlg::CmdRename(CString& sWindowTitle, bool& localoperation)\r
{\r
ASSERT(m_targetPathList.GetCount() == 1);\r
if ((!m_targetPathList[0].IsUrl())&&(!m_url.IsUrl()))\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdResolve(CString& sWindowTitle, bool& localoperation)\r
+bool CGitProgressDlg::CmdResolve(CString& sWindowTitle, bool& localoperation)\r
{\r
localoperation = true;\r
ASSERT(m_targetPathList.GetCount() == 1);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdRevert(CString& sWindowTitle, bool& localoperation)\r
+bool CGitProgressDlg::CmdRevert(CString& sWindowTitle, bool& localoperation)\r
{\r
localoperation = true;\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_REVERT);\r
SetBackgroundImage(IDI_REVERT_BKG);\r
\r
CTSVNPathList delList = m_selectedPaths;\r
- if (DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\RevertWithRecycleBin"), TRUE)))\r
+ if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))\r
delList.DeleteAllFiles(true);\r
\r
ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_REVERT)));\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdSwitch(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdSwitch(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
ASSERT(m_targetPathList.GetCount() == 1);\r
SVNStatus st;\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdUnlock(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdUnlock(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_UNLOCK);\r
SetWindowText(sWindowTitle);\r
return true;\r
}\r
\r
-bool CSVNProgressDlg::CmdUpdate(CString& sWindowTitle, bool& /*localoperation*/)\r
+bool CGitProgressDlg::CmdUpdate(CString& sWindowTitle, bool& /*localoperation*/)\r
{\r
sWindowTitle.LoadString(IDS_PROGRS_TITLE_UPDATE);\r
SetWindowText(sWindowTitle);\r
return true;\r
}\r
\r
-void CSVNProgressDlg::OnBnClickedNoninteractive()\r
+void CGitProgressDlg::OnBnClickedNoninteractive()\r
{\r
LRESULT res = ::SendMessage(GetDlgItem(IDC_NONINTERACTIVE)->GetSafeHwnd(), BM_GETCHECK, 0, 0);\r
m_AlwaysConflicted = (res == BST_CHECKED);\r
- CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseSVN\\MergeNonInteractive"), FALSE);\r
+ CRegDWORD nonint = CRegDWORD(_T("Software\\TortoiseGit\\MergeNonInteractive"), FALSE);\r
nonint = m_AlwaysConflicted;\r
}\r
\r
-CString CSVNProgressDlg::GetPathFromColumnText(const CString& sColumnText)\r
+CString CGitProgressDlg::GetPathFromColumnText(const CString& sColumnText)\r
{\r
CString sPath = CPathUtils::ParsePathInString(sColumnText);\r
if (sPath.Find(':')<0)\r
OSDN Git Service
