/// Returns true if the path (file or folder) has an admin directory \r
/// associated, i.e. if the path is in a working copy.\r
bool HasAdminDir(const CString& path) const;\r
- bool HasAdminDir(const CString& path,CString * ProjectTopDir=NULL) const;\r
+ bool HasAdminDir(const CString& path,CString * ProjectTopDir) const;\r
bool HasAdminDir(const CString& path, bool bDir,CString * ProjectTopDir=NULL) const;\r
CString GetGitTopDir(const CString& path);\r
\r
, m_nSortedColumn(-1)\r
, m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))\r
{\r
+ m_FileLoaded=0;\r
m_critSec.Init();\r
}\r
\r
BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList\r
, bool bUpdate /* = FALSE */\r
, bool bShowIgnores /* = false */\r
+ , bool bShowUnRev\r
, bool bShowUserProps /* = false */)\r
{\r
-#if 0\r
Locker lock(m_critSec);\r
+ int mask= CGitStatusListCtrl::FILELIST_MODIFY;\r
+ if(bShowIgnores)\r
+ mask|= CGitStatusListCtrl::FILELIST_IGNORE;\r
+ if(bShowUnRev)\r
+ mask|= CGitStatusListCtrl::FILELIST_UNVER;\r
+ this->UpdateFileList(mask,bUpdate,(CTGitPathList*)&pathList);\r
+\r
+#if 0\r
+ \r
int refetchcounter = 0;\r
BOOL bRet = TRUE;\r
Invalidate();\r
int nListItems = GetItemCount();\r
for (int i=0; i<nListItems; ++i)\r
{\r
- const CTGitPath& baseDirectory = GetListEntry(i)->GetPath().GetDirectory();\r
+ CTGitPath& baseDirectory = *(CTGitPath*)this->GetItemData(i);\r
if(commonBaseDirectory.IsEmpty())\r
{\r
commonBaseDirectory = baseDirectory;\r
}\r
}\r
\r
-int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash)\r
+int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)\r
{\r
CString out;\r
this->m_bBusy=TRUE;\r
if(hash == GIT_REV_ZERO)\r
{\r
- CString cmd(_T("git.cmd diff-index --raw HEAD --numstat -C -M"));\r
- g_Git.Run(cmd,&out);\r
+ int count = 0;\r
+ if(list == NULL)\r
+ count = 1;\r
+ else\r
+ count = list->GetCount();\r
+\r
+ for(int i=0;i<count;i++)\r
+ { \r
+ CString cmdout;\r
+ CString cmd;\r
+ if(list == NULL)\r
+ cmd=(_T("git.cmd diff-index --raw HEAD --numstat -C -M"));\r
+ else\r
+ cmd.Format(_T("git.cmd diff-index --raw HEAD --numstat -C -M -- \"%s\""),(*list)[i].GetGitPathString());\r
+\r
+ g_Git.Run(cmd,&cmdout);\r
+\r
+ out+=cmdout;\r
+ }\r
+\r
+\r
this->m_StatusFileList.ParserFromLog(out);\r
}\r
for(int i=0;i<m_StatusFileList.GetCount();i++)\r
this->m_bBusy=FALSE;\r
return 0;\r
}\r
-int CGitStatusListCtrl::UpdateUnRevFileList()\r
+int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)\r
{\r
- this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER);\r
+ this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);\r
for(int i=0;i<m_UnRevFileList.GetCount();i++)\r
{\r
CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];\r
return 0;\r
}\r
\r
-int CGitStatusListCtrl::UpdateIgnoreFileList()\r
+int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)\r
{\r
- this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE);\r
+ this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);\r
for(int i=0;i<m_IgnoreFileList.GetCount();i++)\r
{\r
CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];\r
}\r
return 0;\r
}\r
-int CGitStatusListCtrl::UpdateFileList(int mask,bool once)\r
+int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)\r
{\r
if(mask&CGitStatusListCtrl::FILELIST_MODIFY)\r
{\r
if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))\r
{\r
- UpdateFileList(GIT_REV_ZERO);\r
+ UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);\r
m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;\r
}\r
}\r
{\r
if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))\r
{\r
- UpdateUnRevFileList();\r
+ UpdateUnRevFileList(List);\r
m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;\r
}\r
}\r
BOOL GetStatus ( const CTGitPathList& pathList\r
, bool bUpdate = false\r
, bool bShowIgnores = false\r
+ , bool bShowUnRev=false\r
, bool bShowUserProps = false);\r
\r
/**\r
FILELIST_IGNORE =0x4\r
};\r
public:\r
- int UpdateFileList(git_revnum_t hash);\r
- int UpdateFileList(int mask, bool once=true);\r
- int UpdateUnRevFileList();\r
- int UpdateIgnoreFileList();\r
+ int UpdateFileList(git_revnum_t hash,CTGitPathList *List=NULL);\r
+ int UpdateFileList(int mask, bool once=true,CTGitPathList *List=NULL);\r
+ int UpdateUnRevFileList(CTGitPathList *List=NULL);\r
+ int UpdateIgnoreFileList(CTGitPathList *List=NULL);\r
void AddEntry(CTGitPath* path, WORD langID, int ListIndex);\r
int m_FileLoaded;\r
};\r
{\r
AddPath(firstEntry);\r
}\r
-int CTGitPathList::FillUnRev(int action)\r
+int CTGitPathList::FillUnRev(int action,CTGitPathList *list)\r
{\r
int pos=0;\r
this->Clear();\r
CTGitPath path;\r
- \r
- CString cmd(_T("git.cmd ls-files --exclude-standard --full-name --others"));\r
- if(action & CTGitPath::LOGACTIONS_IGNORE)\r
- cmd += _T(" --ignored");\r
- CString out;\r
- g_Git.Run(cmd,&out);\r
\r
- CString one;\r
- while( pos>=0 )\r
- {\r
- one=out.Tokenize(_T("\n"),pos);\r
+ int count;\r
+ if(list==NULL)\r
+ count=1;\r
+ else\r
+ count=list->GetCount();\r
+ for(int i=0;i<count;i++)\r
+ { \r
+ CString cmd;\r
+ \r
+ CString ignored;\r
+ if(action & CTGitPath::LOGACTIONS_IGNORE)\r
+ ignored= _T(" --ignored");\r
+ \r
+ if(list==NULL)\r
+ {\r
+ cmd=_T("git.cmd ls-files --exclude-standard --full-name --others");\r
+ cmd+=ignored;\r
+ \r
+ }\r
+ else\r
+ { cmd.Format(_T("git.cmd ls-files --exclude-standard --full-name --others %s-- \"%s\""),\r
+ ignored,\r
+ (*list)[i].GetWinPathString());\r
+ }\r
+ \r
+ CString out;\r
+ g_Git.Run(cmd,&out);\r
\r
- //SetFromGit will clear all status\r
- path.SetFromGit(one);\r
- path.m_Action=action;\r
- AddPath(path);\r
+ CString one;\r
+ while( pos>=0 )\r
+ {\r
+ one=out.Tokenize(_T("\n"),pos);\r
+\r
+ //SetFromGit will clear all status\r
+ path.SetFromGit(one);\r
+ path.m_Action=action;\r
+ AddPath(path);\r
+ }\r
}\r
return 0;\r
}\r
bool WriteToFile(const CString& sFilename, bool bANSI = false) const;\r
CTGitPath * LookForGitPath(CString path);\r
int ParserFromLog(CString &log);\r
- int FillUnRev(int Action);\r
+ int FillUnRev(int Action,CTGitPathList *list=NULL);\r
int GetAction();\r
/**\r
* Load from the path argument string, when the 'path' parameter is used\r
#include "cursor.h"\r
#include ".\changeddlg.h"\r
\r
+#include "GitStatusListCtrl.h"\r
\r
IMPLEMENT_DYNAMIC(CChangedDlg, CResizableStandAloneDialog)\r
CChangedDlg::CChangedDlg(CWnd* pParent /*=NULL*/)\r
DDX_Check(pDX, IDC_SHOWUNVERSIONED, m_bShowUnversioned);\r
DDX_Check(pDX, IDC_SHOWUNMODIFIED, m_iShowUnmodified);\r
DDX_Check(pDX, IDC_SHOWIGNORED, m_bShowIgnored);\r
- DDX_Check(pDX, IDC_SHOWEXTERNALS, m_bShowExternals);\r
- DDX_Check(pDX, IDC_SHOWUSERPROPS, m_bShowUserProps);\r
+// DDX_Check(pDX, IDC_SHOWEXTERNALS, m_bShowExternals);\r
+// DDX_Check(pDX, IDC_SHOWUSERPROPS, m_bShowUserProps);\r
}\r
\r
\r
ON_BN_CLICKED(IDC_CHECKREPO, OnBnClickedCheckrepo)\r
ON_BN_CLICKED(IDC_SHOWUNVERSIONED, OnBnClickedShowunversioned)\r
ON_BN_CLICKED(IDC_SHOWUNMODIFIED, OnBnClickedShowUnmodified)\r
- ON_BN_CLICKED(IDC_SHOWUSERPROPS, OnBnClickedShowUserProps)\r
- ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
- ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnSVNStatusListCtrlItemCountChanged)\r
+// ON_BN_CLICKED(IDC_SHOWUSERPROPS, OnBnClickedShowUserProps)\r
+ ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
+ ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED, OnSVNStatusListCtrlItemCountChanged)\r
ON_BN_CLICKED(IDC_SHOWIGNORED, &CChangedDlg::OnBnClickedShowignored)\r
ON_BN_CLICKED(IDC_REFRESH, &CChangedDlg::OnBnClickedRefresh)\r
- ON_BN_CLICKED(IDC_SHOWEXTERNALS, &CChangedDlg::OnBnClickedShowexternals)\r
+// ON_BN_CLICKED(IDC_SHOWEXTERNALS, &CChangedDlg::OnBnClickedShowexternals)\r
END_MESSAGE_MAP()\r
\r
BOOL CChangedDlg::OnInitDialog()\r
\r
m_tooltips.Create(this);\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
UpdateData(FALSE);\r
\r
- m_FileListCtrl.Init(SVNSLC_COLTEXTSTATUS | SVNSLC_COLPROPSTATUS | \r
- SVNSLC_COLREMOTETEXT | SVNSLC_COLREMOTEPROP | \r
- SVNSLC_COLLOCK | SVNSLC_COLLOCKCOMMENT |\r
- SVNSLC_COLAUTHOR | SVNSLC_COLAUTHOR |\r
- SVNSLC_COLREVISION | SVNSLC_COLDATE, _T("ChangedDlg"),\r
+ m_FileListCtrl.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS, _T("ChangedDlg"),\r
SVNSLC_POPALL, false);\r
m_FileListCtrl.SetCancelBool(&m_bCanceled);\r
m_FileListCtrl.SetBackgroundImage(IDI_CFM_BKG);\r
AdjustControlSize(IDC_SHOWUNVERSIONED);\r
AdjustControlSize(IDC_SHOWUNMODIFIED);\r
AdjustControlSize(IDC_SHOWIGNORED);\r
- AdjustControlSize(IDC_SHOWEXTERNALS);\r
- AdjustControlSize(IDC_SHOWUSERPROPS);\r
+// AdjustControlSize(IDC_SHOWEXTERNALS);\r
+// AdjustControlSize(IDC_SHOWUSERPROPS);\r
\r
AddAnchor(IDC_CHANGEDLIST, TOP_LEFT, BOTTOM_RIGHT);\r
AddAnchor(IDC_SUMMARYTEXT, BOTTOM_LEFT, BOTTOM_RIGHT);\r
AddAnchor(IDC_SHOWUNVERSIONED, BOTTOM_LEFT);\r
AddAnchor(IDC_SHOWUNMODIFIED, BOTTOM_LEFT);\r
AddAnchor(IDC_SHOWIGNORED, BOTTOM_LEFT);\r
- AddAnchor(IDC_SHOWEXTERNALS, BOTTOM_LEFT);\r
- AddAnchor(IDC_SHOWUSERPROPS, BOTTOM_LEFT);\r
+// AddAnchor(IDC_SHOWEXTERNALS, BOTTOM_LEFT);\r
+// AddAnchor(IDC_SHOWUSERPROPS, BOTTOM_LEFT);\r
AddAnchor(IDC_INFOLABEL, BOTTOM_RIGHT);\r
AddAnchor(IDC_REFRESH, BOTTOM_RIGHT);\r
AddAnchor(IDC_CHECKREPO, BOTTOM_RIGHT);\r
AddAnchor(IDOK, BOTTOM_RIGHT);\r
- SetPromptParentWindow(m_hWnd);\r
+// SetPromptParentWindow(m_hWnd);\r
if (hWndExplorer)\r
CenterWindow(CWnd::FromHandle(hWndExplorer));\r
EnableSaveRestore(_T("ChangedDlg"));\r
\r
- m_bRemote = !!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\CheckRepo"), FALSE);\r
+ m_bRemote = !!(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\CheckRepo"), FALSE);\r
\r
// first start a thread to obtain the status without\r
// blocking the dialog\r
DialogEnableWindow(IDC_SHOWIGNORED, FALSE);\r
DialogEnableWindow(IDC_SHOWUSERPROPS, FALSE);\r
CString temp;\r
- if (!m_FileListCtrl.GetStatus(m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUserProps != FALSE))\r
+ if (!m_FileListCtrl.GetStatus(m_pathList, m_bRemote, m_bShowIgnored != FALSE, m_bShowUnversioned,m_bShowUserProps != FALSE))\r
{\r
if (!m_FileListCtrl.GetLastErrorMessage().IsEmpty())\r
m_FileListCtrl.SetEmptyString(m_FileListCtrl.GetLastErrorMessage());\r
m_FileListCtrl.Show(dwShow);\r
UpdateStatistics();\r
\r
- CTSVNPath commonDir = m_FileListCtrl.GetCommonDirectory(false);\r
+\r
+ CTGitPath commonDir = m_FileListCtrl.GetCommonDirectory(false);\r
bool bSingleFile = ((m_pathList.GetCount()==1)&&(!m_pathList[0].IsDirectory()));\r
if (bSingleFile)\r
SetWindowText(m_sTitle + _T(" - ") + m_pathList[0].GetWinPathString());\r
else\r
SetWindowText(m_sTitle + _T(" - ") + commonDir.GetWinPathString());\r
+\r
SetDlgItemText(IDOK, CString(MAKEINTRESOURCE(IDS_MSGBOX_OK)));\r
DialogEnableWindow(IDC_REFRESH, TRUE);\r
DialogEnableWindow(IDC_CHECKREPO, TRUE);\r
DialogEnableWindow(IDC_SHOWUSERPROPS, TRUE);\r
InterlockedExchange(&m_bBlock, FALSE);\r
// revert the remote flag back to the default\r
- m_bRemote = !!(DWORD)CRegDWORD(_T("Software\\TortoiseSVN\\CheckRepo"), FALSE);\r
+ m_bRemote = !!(DWORD)CRegDWORD(_T("Software\\TortoiseGit\\CheckRepo"), FALSE);\r
RefreshCursor();\r
return 0;\r
}\r
\r
void CChangedDlg::UpdateStatistics()\r
{\r
- LONG lMin, lMax;\r
CString temp;\r
+#if 0\r
+ LONG lMin, lMax;\r
+ \r
m_FileListCtrl.GetMinMaxRevisions(lMin, lMax, true, false);\r
if (LONG(m_FileListCtrl.m_HeadRev) >= 0)\r
{\r
temp.Format(IDS_REPOSTATUS_WCINFO, lMin, lMax);\r
SetDlgItemText(IDC_SUMMARYTEXT, temp);\r
}\r
+#endif\r
temp = m_FileListCtrl.GetStatisticsString();\r
temp.Replace(_T(" = "), _T("="));\r
temp.Replace(_T("\n"), _T(", "));\r
SetDlgItemText(IDC_INFOLABEL, temp);\r
+\r
}\r
\r
\r
#pragma once\r
\r
#include "StandAloneDlg.h"\r
-#include "SVN.h"\r
-#include "SVNStatusListCtrl.h"\r
+#include "Git.h"\r
#include "Registry.h"\r
#include "Tooltip.h"\r
\r
+#include "GitStatusListCtrl.h"\r
\r
/**\r
* \ingroup TortoiseProc\r
* Shows the "check for modifications" dialog.\r
*/\r
-class CChangedDlg : public CResizableStandAloneDialog, public SVN\r
+class CChangedDlg : public CResizableStandAloneDialog\r
{\r
DECLARE_DYNAMIC(CChangedDlg)\r
\r
DWORD UpdateShowFlags();\r
\r
public: \r
- CTSVNPathList m_pathList;\r
+ CTGitPathList m_pathList;\r
\r
private:\r
CRegDWORD m_regAddBeforeCommit;\r
- CSVNStatusListCtrl m_FileListCtrl;\r
+ CGitStatusListCtrl m_FileListCtrl;\r
bool m_bRemote;\r
BOOL m_bShowUnversioned;\r
int m_iShowUnmodified;\r
\r
#include "MessageBox.h"\r
#include "ProgressDlg.h"\r
-#include "SVN.h"\r
-#include "SVNGlobal.h"\r
-#include "SVNAdminDir.h"\r
+#include "Git.h"\r
+//#include "GitGlobal.h"\r
+#include "GitAdminDir.h"\r
#include "DirFileEnum.h"\r
#include "ShellUpdater.h"\r
\r
bool CleanupCommand::Execute()\r
{\r
bool bRet = false;\r
+#if 0\r
CProgressDlg progress;\r
progress.SetTitle(IDS_PROC_CLEANUP);\r
progress.SetAnimation(IDR_CLEANUPANI);\r
bRet = false;\r
}\r
CMessageBox::Show(hwndExplorer, strMessage, _T("TortoiseSVN"), MB_OK | (strFailedPaths.IsEmpty()?MB_ICONINFORMATION:MB_ICONERROR));\r
-\r
+#endif\r
return bRet;\r
}\r
#include "PrevDiffCommand.h"\r
#include "DiffCommand.h"\r
\r
+#include "RenameCommand.h"\r
+#include "RepoStatusCommand.h"\r
+\r
+#include "RevertCommand.h"\r
+#include "RemoveCommand.h"\r
+\r
#if 0\r
#include "AddCommand.h"\r
#include "BlameCommand.h"\r
#include "RebuildIconCacheCommand.h"\r
#include "RelocateCommand.h"\r
#include "RemoveCommand.h"\r
-#include "RenameCommand.h"\r
+\r
#include "RepositoryBrowserCommand.h"\r
-#include "RepoStatusCommand.h"\r
+\r
#include "ResolveCommand.h"\r
#include "RevertCommand.h"\r
#include "RevisiongraphCommand.h"\r
return new PrevDiffCommand;\r
case cmdDiff:\r
return new DiffCommand;\r
+ case cmdRename:\r
+ return new RenameCommand;\r
+ case cmdRepoStatus:\r
+ return new RepoStatusCommand;\r
+ case cmdRemove:\r
+ return new RemoveCommand;\r
+ case cmdRevert:\r
+ return new RevertCommand;\r
#if 0\r
case cmdAdd:\r
return new AddCommand;\r
return new RelocateCommand;\r
case cmdRemove:\r
return new RemoveCommand;\r
- case cmdRename:\r
- return new RenameCommand;\r
+\r
case cmdRepoBrowser:\r
return new RepositoryBrowserCommand;\r
\r
- case cmdRepoStatus:\r
- return new RepoStatusCommand;\r
+\r
case cmdResolve:\r
return new ResolveCommand;\r
case cmdRevert:\r
CString WinPath=path.GetWinPath();\r
if(WinPath.Left(g_Git.m_CurrentDir.GetLength())==g_Git.m_CurrentDir)\r
cmdLinePath.SetFromWin( WinPath.Right(WinPath.GetLength()-g_Git.m_CurrentDir.GetLength()-1));\r
+ \r
+ orgPathList = plist; \r
+ for(int i=0;i<plist.GetCount();i++)\r
+ {\r
+ WinPath=plist[i].GetWinPath();\r
+ CTGitPath p;\r
+ if(WinPath.Left(g_Git.m_CurrentDir.GetLength())==g_Git.m_CurrentDir)\r
+ {\r
+ p.SetFromWin( WinPath.Right(WinPath.GetLength()-g_Git.m_CurrentDir.GetLength()-1));\r
+ }else\r
+ p=plist[i];\r
+ pathList.AddPath(p);\r
\r
- pathList = plist; \r
+ }\r
}\r
void SetExplorerHwnd(HWND hWnd) {hwndExplorer = hWnd;}\r
protected:\r
CCmdLineParser parser;\r
CTGitPathList pathList;\r
+ CTGitPathList orgPathList;\r
CTGitPath cmdLinePath;\r
CTGitPath orgCmdLinePath;\r
HWND hwndExplorer;\r
#include "DiffCommand.h"\r
#include "PathUtils.h"\r
#include "AppUtils.h"\r
-//#include "ChangedDlg.h"\r
+#include "ChangedDlg.h"\r
#include "GitDiff.h"\r
#include "GitStatus.h"\r
\r
{\r
if (cmdLinePath.IsDirectory())\r
{\r
- //CChangedDlg dlg;\r
- //dlg.m_pathList = CTSVNPathList(cmdLinePath);\r
- //dlg.DoModal();\r
- //bRet = true;\r
+ CChangedDlg dlg;\r
+ dlg.m_pathList = CTGitPathList(cmdLinePath);\r
+ dlg.DoModal();\r
+ bRet = true;\r
}\r
else\r
{\r
CGitDiff diff;\r
//diff.SetAlternativeTool(bAlternativeTool);\r
+#if 0\r
if ( parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")) )\r
{\r
//SVNRev StartRevision = SVNRev(parser.GetLongVal(_T("startrev")));\r
//bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, SVNRev(), false, bBlame);\r
}\r
else\r
+#endif\r
{\r
//svn_revnum_t baseRev = 0;\r
bRet = diff.Diff(&cmdLinePath,git_revnum_t(_T("HEAD")),git_revnum_t(GIT_REV_ZERO));\r
#include "GitDiff.h"\r
#include "GitStatus.h"\r
#include "MessageBox.h"\r
+#include "ChangedDlg.h"\r
\r
bool PrevDiffCommand::Execute()\r
{\r
bool bAlternativeTool = !!parser.HasKey(_T("alternative"));\r
if (cmdLinePath.IsDirectory())\r
{\r
-// CChangedDlg dlg;\r
-// dlg.m_pathList = CTSVNPathList(cmdLinePath);\r
-// dlg.DoModal();\r
-// bRet = true;\r
+ CChangedDlg dlg;\r
+ dlg.m_pathList = CTGitPathList(cmdLinePath);\r
+ dlg.DoModal();\r
+ bRet = true;\r
}\r
else\r
{\r
#include "RemoveCommand.h"\r
\r
#include "MessageBox.h"\r
-#include "ProgressDlg.h"\r
-#include "SVN.h"\r
+//#include "ProgressDlg.h"\r
+#include "Git.h"\r
#include "InputLogDlg.h"\r
#include "ShellUpdater.h"\r
\r
//\r
// removing items from an URL in the repository requires that we\r
// ask the user for a log message.\r
+#if 0\r
BOOL bForce = FALSE;\r
SVN svn;\r
if ((pathList.GetCount())&&(SVN::PathIsURL(pathList[0])))\r
}\r
if (bRet)\r
CShellUpdater::Instance().AddPathsForUpdate(pathList);\r
+#endif\r
return bRet;\r
}\r
#include "RenameCommand.h"\r
\r
#include "MessageBox.h"\r
-#include "SVNProgressDlg.h"\r
-#include "ProgressDlg.h"\r
+//#include "SVNProgressDlg.h"\r
+//#include "ProgressDlg.h"\r
#include "RenameDlg.h"\r
#include "InputLogDlg.h"\r
-#include "SVN.h"\r
+#include "Git.h"\r
#include "DirFileEnum.h"\r
#include "ShellUpdater.h"\r
\r
{\r
bool bRet = false;\r
CString filename = cmdLinePath.GetFileOrDirectoryName();\r
- CString basePath = cmdLinePath.GetContainingDirectory().GetWinPathString();\r
- ::SetCurrentDirectory(basePath);\r
+ CString basePath = cmdLinePath.GetContainingDirectory().GetGitPathString();\r
+ //::SetCurrentDirectory(basePath);\r
\r
// show the rename dialog until the user either cancels or enters a new\r
// name (one that's different to the original name\r
sNewName = dlg.m_name;\r
} while(PathIsRelative(sNewName) && !PathIsURL(sNewName) && (sNewName.IsEmpty() || (sNewName.Compare(filename)==0)));\r
\r
+ if(!basePath.IsEmpty())\r
+ sNewName=basePath+"/"+sNewName;\r
+\r
+ CString cmd;\r
+ CString output;\r
+ cmd.Format(_T("git.cmd mv \"%s\" \"%s\""),\r
+ cmdLinePath.GetGitPathString(),\r
+ sNewName);\r
+ \r
+ if(g_Git.Run(cmd,&output))\r
+ {\r
+ CMessageBox::Show(hwndExplorer, output, _T("TortoiseGit"), MB_OK);\r
+ }\r
+\r
+#if 0\r
TRACE(_T("rename file %s to %s\n"), (LPCTSTR)cmdLinePath.GetWinPathString(), (LPCTSTR)sNewName);\r
CTSVNPath destinationPath(basePath);\r
if (PathIsRelative(sNewName) && !PathIsURL(sNewName))\r
}\r
}\r
}\r
+#endif\r
return bRet;\r
}\r
#include "RevertCommand.h"\r
\r
#include "RevertDlg.h"\r
-#include "SVNProgressDlg.h"\r
+//#include "SVNProgressDlg.h"\r
#include "MessageBox.h"\r
\r
bool RevertCommand::Execute()\r
dlg.m_pathList = pathList;\r
if (dlg.DoModal() == IDOK)\r
{\r
+\r
if (dlg.m_pathList.GetCount() == 0)\r
return FALSE;\r
+ CString cmd;\r
+ CString out;\r
+ for(int i=0;i< dlg.m_pathList.GetCount() ;i++)\r
+ {\r
+ cmd.Format(_T("git.cmd reset --hard -- \"%s\""),dlg.m_pathList[i].GetGitPathString());\r
+ g_Git.Run(cmd,&out);\r
+ }\r
+#if 0\r
CSVNProgressDlg progDlg;\r
theApp.m_pMainWnd = &progDlg;\r
progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Revert);\r
progDlg.SetItemCount(dlg.m_selectedPathList.GetCount());\r
progDlg.SetSelectedList(dlg.m_selectedPathList);\r
progDlg.DoModal();\r
- return !progDlg.DidErrorsOccur();\r
+#endif\r
+ return true;\r
}\r
return false;\r
}\r
#include "SwitchCommand.h"\r
\r
#include "SwitchDlg.h"\r
-#include "SVNProgressDlg.h"\r
+//#include "SVNProgressDlg.h"\r
#include "MessageBox.h"\r
\r
bool SwitchCommand::Execute()\r
\r
if (dlg.DoModal() == IDOK)\r
{\r
+#if 0\r
CSVNProgressDlg progDlg;\r
theApp.m_pMainWnd = &progDlg;\r
progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Switch);\r
progDlg.SetRevision(dlg.Revision);\r
progDlg.DoModal();\r
return !progDlg.DidErrorsOccur();\r
+#endif;\r
+ return true;\r
}\r
return false;\r
}\r
// Initialise the list control with the status of the files/folders below us\r
BOOL success = m_ListCtrl.GetStatus(m_pathList);\r
\r
- m_ListCtrl.UpdateFileList(GIT_REV_ZERO);\r
+ m_ListCtrl.UpdateFileList(git_revnum_t(GIT_REV_ZERO));\r
if(this->m_bShowUnversioned)\r
m_ListCtrl.UpdateFileList(CGitStatusListCtrl::FILELIST_UNVER);\r
\r
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
//\r
#pragma once\r
-#include "svn_wc.h"\r
+//#include "svn_wc.h"\r
#include "StandAloneDlg.h"\r
\r
/**\r
//\r
#pragma once\r
#include "registry.h"\r
-#include "TSVNPath.h"\r
+#include "TGitPath.h"\r
#include <list>\r
\r
/**\r
\r
private:\r
CRegStdWORD m_maxlines;\r
- CTSVNPath m_logfile;\r
+ CTGitPath m_logfile;\r
std::list<CString> m_lines;\r
};\r
#include "stdafx.h"\r
#include "TortoiseProc.h"\r
#include "MessageBox.h"\r
-#include "TSVNPath.h"\r
+#include "TGitPath.h"\r
#include "RenameDlg.h"\r
#include ".\renamedlg.h"\r
\r
{\r
UpdateData();\r
m_name.Trim();\r
- CTSVNPath path(m_name);\r
+ CTGitPath path(m_name);\r
if (!path.IsValidOnWindows())\r
{\r
if (CMessageBox::Show(GetSafeHwnd(), IDS_WARN_NOVALIDPATH, IDS_APPNAME, MB_ICONWARNING | MB_OKCANCEL)==IDCANCEL)\r
#include "TortoiseProc.h"\r
#include "messagebox.h"\r
#include "Revertdlg.h"\r
-#include "SVN.h"\r
+#include "Git.h"\r
#include "Registry.h"\r
#include ".\revertdlg.h"\r
\r
BEGIN_MESSAGE_MAP(CRevertDlg, CResizableStandAloneDialog)\r
ON_BN_CLICKED(IDHELP, OnBnClickedHelp)\r
ON_BN_CLICKED(IDC_SELECTALL, OnBnClickedSelectall)\r
- ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
- ON_REGISTERED_MESSAGE(CSVNStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)\r
+ ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH, OnSVNStatusListCtrlNeedsRefresh)\r
+ ON_REGISTERED_MESSAGE(CGitStatusListCtrl::SVNSLNM_ADDFILE, OnFileDropped)\r
ON_WM_TIMER()\r
END_MESSAGE_MAP()\r
\r
// do not select all files, only the ones the user has selected directly\r
SVNSLC_SHOWDIRECTFILES|SVNSLC_SHOWADDED);\r
\r
- CTSVNPath commonDir = m_RevertList.GetCommonDirectory(false);\r
+ CTGitPath commonDir = m_RevertList.GetCommonDirectory(false);\r
SetWindowText(m_sWindowTitle + _T(" - ") + commonDir.GetWinPathString());\r
\r
if (m_RevertList.HasUnversionedItems())\r
{\r
- if (DWORD(CRegStdWORD(_T("Software\\TortoiseSVN\\UnversionedAsModified"), FALSE)))\r
+ if (DWORD(CRegStdWORD(_T("Software\\TortoiseGit\\UnversionedAsModified"), FALSE)))\r
{\r
GetDlgItem(IDC_UNVERSIONEDITEMS)->ShowWindow(SW_SHOW);\r
}\r
}\r
else \r
{\r
- CSVNStatusListCtrl::FileEntry * entry = m_RevertList.GetListEntry(i);\r
+ m_selectedPathList.AddPath(*(CTGitPath*)m_RevertList.GetItemData(i));\r
+#if 0\r
+ CGitStatusListCtrl::FileEntry * entry = m_RevertList.GetListEntry(i);\r
// add all selected entries to the list, except the ones with 'added'\r
// status: we later *delete* all the entries in the list before\r
// the actual revert is done (so the user has the reverted files\r
// external boundaries.\r
if (entry->IsInExternal())\r
m_bRecursive = FALSE;\r
+#endif\r
}\r
}\r
if (!m_bRecursive)\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
if (!m_RevertList.HasPath(path))\r
#pragma once\r
\r
#include "StandAloneDlg.h"\r
-#include "SVNStatusListCtrl.h"\r
+#include "GitStatusListCtrl.h"\r
\r
\r
/**\r
UINT RevertThread();\r
\r
public:\r
- CTSVNPathList m_pathList;\r
- CTSVNPathList m_selectedPathList;\r
+ CTGitPathList m_pathList;\r
+ CTGitPathList m_selectedPathList;\r
BOOL m_bRecursive;\r
\r
private:\r
BOOL m_bSelectAll;\r
CString m_sWindowTitle;\r
volatile LONG m_bThreadRunning;\r
- CSVNStatusListCtrl m_RevertList;\r
+ CGitStatusListCtrl m_RevertList;\r
CButton m_SelectAll;\r
bool m_bCancelled;\r
};\r
#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
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
}\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
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
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
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
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
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
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
#include "stdafx.h"\r
#include "TortoiseProc.h"\r
#include "SwitchDlg.h"\r
-#include "RepositoryBrowser.h"\r
+//#include "RepositoryBrowser.h"\r
#include "BrowseFolder.h"\r
-#include "TSVNPath.h"\r
+#include "TGitPath.h"\r
#include "AppUtils.h"\r
\r
IMPLEMENT_DYNAMIC(CSwitchDlg, CResizableStandAloneDialog)\r
CSwitchDlg::CSwitchDlg(CWnd* pParent /*=NULL*/)\r
: CResizableStandAloneDialog(CSwitchDlg::IDD, pParent)\r
, m_URL(_T(""))\r
- , Revision(_T("HEAD"))\r
+// , Revision(_T("HEAD"))\r
, m_pLogDlg(NULL)\r
{\r
}\r
{\r
CResizableStandAloneDialog::OnInitDialog();\r
\r
- CTSVNPath svnPath(m_path);\r
+ CTGitPath GitPath(m_path);\r
SetDlgItemText(IDC_SWITCHPATH, m_path);\r
- m_bFolder = svnPath.IsDirectory();\r
- SVN svn;\r
- CString url = svn.GetURLFromPath(svnPath);\r
- CString sUUID = svn.GetUUIDFromPath(svnPath);\r
- m_URLCombo.SetURLHistory(TRUE);\r
- m_URLCombo.LoadHistory(_T("Software\\TortoiseSVN\\History\\repoURLS\\")+sUUID, _T("url"));\r
- m_URLCombo.SetCurSel(0);\r
-\r
- if (!url.IsEmpty())\r
- {\r
- m_path = url;\r
- m_URLCombo.AddString(CTSVNPath(url).GetUIPathString(), 0);\r
- m_URLCombo.SelectString(-1, CTSVNPath(url).GetUIPathString());\r
- m_URL = m_path;\r
- }\r
+ m_bFolder = GitPath.IsDirectory();\r
+ //Git Git;\r
+ //CString url = Git.GetURLFromPath(GitPath);\r
+ //CString sUUID = Git.GetUUIDFromPath(GitPath);\r
+ //m_URLCombo.SetURLHistory(TRUE);\r
+ //m_URLCombo.LoadHistory(_T("Software\\TortoiseGit\\History\\repoURLS\\")+sUUID, _T("url"));\r
+ //m_URLCombo.SetCurSel(0);\r
+\r
+// if (!url.IsEmpty())\r
+// {\r
+// m_path = url;\r
+// m_URLCombo.AddString(CTGitPath(url).GetUIPathString(), 0);\r
+// m_URLCombo.SelectString(-1, CTGitPath(url).GetUIPathString());\r
+// m_URL = m_path;\r
+// }\r
\r
if (m_sTitle.IsEmpty())\r
GetWindowText(m_sTitle);\r
SetDlgItemText(IDC_URLLABEL, m_sLabel);\r
\r
// set head revision as default revision\r
- SetRevision(SVNRev::REV_HEAD);\r
+// SetRevision(GitRev::REV_HEAD);\r
\r
RECT rect;\r
GetWindowRect(&rect);\r
void CSwitchDlg::OnBnClickedBrowse()\r
{\r
UpdateData();\r
- SVNRev rev;\r
+ GitRev rev;\r
if (GetCheckedRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N) == IDC_REVISION_HEAD)\r
{\r
- rev = SVNRev::REV_HEAD;\r
+// rev = GitRev::REV_HEAD;\r
}\r
- else\r
- rev = SVNRev(m_rev);\r
- if (!rev.IsValid())\r
- rev = SVNRev::REV_HEAD;\r
- CAppUtils::BrowseRepository(m_URLCombo, this, rev);\r
- SetRevision(rev);\r
+// else\r
+// rev = GitRev(m_rev);\r
+// if (!rev.IsValid())\r
+// rev = GitRev::REV_HEAD;\r
+// CAppUtils::BrowseRepository(m_URLCombo, this, rev);\r
+// SetRevision(rev);\r
}\r
\r
void CSwitchDlg::OnOK()\r
{\r
m_rev = _T("HEAD");\r
}\r
- Revision = SVNRev(m_rev);\r
- if (!Revision.IsValid())\r
- {\r
- ShowBalloon(IDC_REVISION_NUM, IDS_ERR_INVALIDREV);\r
- return;\r
- }\r
+// Revision = GitRev(m_rev);\r
+// if (!Revision.IsValid())\r
+// {\r
+// ShowBalloon(IDC_REVISION_NUM, IDS_ERR_INVALIDREV);\r
+// return;\r
+// }\r
\r
m_URLCombo.SaveHistory();\r
m_URL = m_URLCombo.GetString();\r
CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_N);\r
}\r
\r
-void CSwitchDlg::SetRevision(const SVNRev& rev)\r
+void CSwitchDlg::SetRevision(const GitRev& rev)\r
{\r
- if (rev.IsHead())\r
- CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_HEAD);\r
- else\r
- {\r
- CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_N);\r
- m_rev = rev.ToString();\r
- UpdateData(FALSE);\r
- }\r
+// if (rev.IsHead())\r
+// CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_HEAD);\r
+// else\r
+// {\r
+// CheckRadioButton(IDC_REVISION_HEAD, IDC_REVISION_N, IDC_REVISION_N);\r
+// m_rev = rev.ToString();\r
+// UpdateData(FALSE);\r
+// }\r
}\r
\r
void CSwitchDlg::OnBnClickedLog()\r
{\r
delete m_pLogDlg;\r
m_pLogDlg = new CLogDlg();\r
- CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseSVN\\NumberOfLogs"), 100);\r
+ CRegDWORD reg = CRegDWORD(_T("Software\\TortoiseGit\\NumberOfLogs"), 100);\r
int limit = (int)(LONG)reg;\r
m_pLogDlg->SetSelect(true);\r
m_pLogDlg->m_pNotifyWindow = this;\r
m_pLogDlg->m_wParam = 0;\r
- m_pLogDlg->SetParams(CTSVNPath(m_URL), SVNRev::REV_HEAD, SVNRev::REV_HEAD, 1, limit, TRUE);\r
+// m_pLogDlg->SetParams(CTGitPath(m_URL), GitRev::REV_HEAD, GitRev::REV_HEAD, 1, limit, TRUE);\r
m_pLogDlg->ContinuousSelection(true);\r
- m_pLogDlg->SetProjectPropertiesPath(CTSVNPath(m_path));\r
+ m_pLogDlg->SetProjectPropertiesPath(CTGitPath(m_path));\r
m_pLogDlg->Create(IDD_LOGMESSAGE, this);\r
m_pLogDlg->ShowWindow(SW_SHOW);\r
}\r
#include "StandAloneDlg.h"\r
#include "HistoryCombo.h"\r
#include "LogDlg.h"\r
-#include "SVNRev.h"\r
+#include "GitRev.h"\r
\r
/**\r
* \ingroup TortoiseProc\r
afx_msg void OnSizing(UINT fwSide, LPRECT pRect);\r
afx_msg LRESULT OnRevSelected(WPARAM wParam, LPARAM lParam);\r
\r
- void SetRevision(const SVNRev& rev);\r
+ void SetRevision(const GitRev& rev);\r
\r
DECLARE_MESSAGE_MAP()\r
\r
public:\r
CString m_path;\r
CString m_URL;\r
- SVNRev Revision;\r
+ GitRev Revision;\r
};\r
break;\r
}\r
\r
+ if(g_Git.m_CurrentDir)\r
+ SetCurrentDirectory(g_Git.m_CurrentDir);\r
+\r
cmd->SetParser(parser);\r
cmd->SetPaths(pathList, cmdLinePath);\r
\r
Name="Commit"\r
>\r
<File\r
- RelativePath=".\Commands\CloneCommand.cpp"\r
- >\r
- </File>\r
- <File\r
- RelativePath=".\Commands\CloneCommand.h"\r
- >\r
- </File>\r
- <File\r
RelativePath=".\Commands\CommitCommand.cpp"\r
>\r
</File>\r
>\r
</File>\r
</Filter>\r
+ <Filter\r
+ Name="Rename"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\RenameCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\RenameCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="ReposStatus"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\RepoStatusCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\RepoStatusCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Remove"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\RemoveCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\RemoveCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Revert"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\RevertCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\RevertCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Clean"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\CleanupCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\CleanupCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Switch"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\SwitchCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\SwitchCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
+ <Filter\r
+ Name="Clone"\r
+ >\r
+ <File\r
+ RelativePath=".\Commands\CloneCommand.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\Commands\CloneCommand.h"\r
+ >\r
+ </File>\r
+ </Filter>\r
</Filter>\r
<Filter\r
Name="Utility Dialogs"\r
>\r
<File\r
+ RelativePath=".\ChangedDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\ChangedDlg.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\FileDiffDlg.cpp"\r
>\r
</File>\r
RelativePath=".\FileDiffDlg.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\RenameDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RenameDlg.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RevertDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\RevertDlg.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SVNProgressDlg.h"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Git"\r
RelativePath=".\GitStatusListCtrlHelpers.cpp"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\SwitchDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SwitchDlg.h"\r
+ >\r
+ </File>\r
<Filter\r
Name="Compare"\r
>\r
</Filter>\r
</Filter>\r
<File\r
- RelativePath=".\CloneDlg.htm"\r
- DeploymentContent="true"\r
- >\r
- </File>\r
- <File\r
RelativePath="Resource.h"\r
>\r
</File>\r
<DebugSettings\r
Command="$(TargetPath)"\r
WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
- CommandArguments="/command:diff /path:"D:\Profiles\b20596\qgit4\src\cache.cpp""\r
+ CommandArguments="/command:revert /path:"D:\Profiles\b20596\qgit4\src""\r
Attach="false"\r
DebuggerType="3"\r
Remote="1"\r
// { ShellMenuCopy, MENUCOPY, IDI_COPY, IDS_MENUBRANCH, IDS_MENUDESCCOPY,\r
// ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
\r
-// { ShellMenuSwitch, MENUSWITCH, IDI_SWITCH, IDS_MENUSWITCH, IDS_MENUDESCSWITCH,\r
-// ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
+ { ShellMenuSwitch, MENUSWITCH, IDI_SWITCH, IDS_MENUSWITCH, IDS_MENUDESCSWITCH,\r
+ ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
\r
{ ShellMenuMerge, MENUMERGE, IDI_MERGE, IDS_MENUMERGE, IDS_MENUDESCMERGE,\r
ITEMIS_INSVN|ITEMIS_ONLYONE, ITEMIS_ADDED, ITEMIS_FOLDER|ITEMIS_FOLDERINSVN|ITEMIS_ONLYONE, 0, 0, 0, 0, 0 },\r
OSDN Git Service
