EndProject\r
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TSVNCache", "TGitCache\TSVNCache.vcproj", "{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}"\r
EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wrap", "Wrap\Wrap.vcproj", "{F5ACFF87-241F-4F93-BD5B-444B47A20ED7}"\r
-EndProject\r
Global\r
- GlobalSection(TestCaseManagementSettings) = postSolution\r
- CategoryFile = TortoiseGit.vsmdi\r
- EndGlobalSection\r
GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
debug_static|Mixed Platforms = debug_static|Mixed Platforms\r
debug_static|Win32 = debug_static|Win32\r
{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.ActiveCfg = Release|Win32\r
{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|Win32.Build.0 = Release|Win32\r
{A00D2EDC-B4F5-4B41-94BA-13961DE5D296}.Release|x86.ActiveCfg = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|Mixed Platforms.ActiveCfg = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|Mixed Platforms.Build.0 = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|Win32.ActiveCfg = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|Win32.Build.0 = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.debug_static|x86.ActiveCfg = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|Win32.ActiveCfg = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|Win32.Build.0 = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Debug|x86.ActiveCfg = Debug|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|Mixed Platforms.ActiveCfg = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|Mixed Platforms.Build.0 = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|Win32.ActiveCfg = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|Win32.Build.0 = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.release_static|x86.ActiveCfg = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|Mixed Platforms.Build.0 = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|Win32.ActiveCfg = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|Win32.Build.0 = Release|Win32\r
- {F5ACFF87-241F-4F93-BD5B-444B47A20ED7}.Release|x86.ActiveCfg = Release|Win32\r
EndGlobalSection\r
GlobalSection(SolutionProperties) = preSolution\r
HideSolutionNode = FALSE\r
--- /dev/null
+// CreateBranchTagDlg.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "CreateBranchTagDlg.h"\r
+\r
+\r
+// CCreateBranchTagDlg dialog\r
+\r
+IMPLEMENT_DYNAMIC(CCreateBranchTagDlg, CResizableStandAloneDialog)\r
+\r
+CCreateBranchTagDlg::CCreateBranchTagDlg(CWnd* pParent /*=NULL*/)\r
+ : CResizableStandAloneDialog(CCreateBranchTagDlg::IDD, pParent)\r
+{\r
+\r
+}\r
+\r
+CCreateBranchTagDlg::~CCreateBranchTagDlg()\r
+{\r
+}\r
+\r
+void CCreateBranchTagDlg::DoDataExchange(CDataExchange* pDX)\r
+{\r
+ CDialog::DoDataExchange(pDX);\r
+ DDX_Control(pDX, IDC_COMBOBOXEX_BRANCH, this->m_Branch);\r
+ DDX_Control(pDX, IDC_COMBOBOXEX_TAGS, this->m_Tags);\r
+ DDX_Control(pDX, IDC_COMBOBOXEX_VERSION, this->m_Version);\r
+ \r
+ DDX_Text(pDX, IDC_BRANCH_TAG, this->m_BranchTagName);\r
+ DDX_Check(pDX,IDC_CHECK_FORCE,this->m_bForce);\r
+ DDX_Check(pDX,IDC_CHECK_TRACK,this->m_bTrack);\r
+\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CCreateBranchTagDlg, CResizableStandAloneDialog)\r
+END_MESSAGE_MAP()\r
+\r
+BOOL CCreateBranchTagDlg::OnInitDialog()\r
+{\r
+ CResizableStandAloneDialog::OnInitDialog();\r
+\r
+ AddAnchor(IDC_COMBOBOXEX_BRANCH, TOP_LEFT, TOP_RIGHT);\r
+ AddAnchor(IDC_COMBOBOXEX_TAGS, TOP_LEFT, TOP_RIGHT);\r
+ AddAnchor(IDC_COMBOBOXEX_VERSION, TOP_LEFT, TOP_RIGHT);\r
+\r
+ AddAnchor(IDC_GROUP_BRANCH, TOP_LEFT, TOP_RIGHT);\r
+ AddAnchor(IDC_GROUP_BASEON, TOP_LEFT, TOP_RIGHT);\r
+ AddAnchor(IDC_GROUP_OPTION, TOP_LEFT, TOP_RIGHT);\r
+\r
+ AddAnchor(IDOK,BOTTOM_RIGHT);\r
+ AddAnchor(IDCANCEL,BOTTOM_RIGHT);\r
+\r
+ return TRUE;\r
+\r
+\r
+}\r
+// CCreateBranchTagDlg message handlers\r
--- /dev/null
+#pragma once\r
+\r
+#include "StandAloneDlg.h"\r
+#include "HistoryCombo.h"\r
+\r
+// CCreateBranchTagDlg dialog\r
+\r
+class CCreateBranchTagDlg : public CResizableStandAloneDialog\r
+{\r
+ DECLARE_DYNAMIC(CCreateBranchTagDlg)\r
+\r
+public:\r
+ CCreateBranchTagDlg(CWnd* pParent = NULL); // standard constructor\r
+ virtual ~CCreateBranchTagDlg();\r
+\r
+// Dialog Data\r
+ enum { IDD = IDD_NEW_BRANCH_TAG };\r
+\r
+ BOOL m_bForce;\r
+ BOOL m_bTrack;\r
+ BOOL m_bIsTag;\r
+\r
+ CString m_Base;\r
+ CString m_BranchTagName;\r
+protected:\r
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support\r
+ virtual BOOL OnInitDialog();\r
+ \r
+ CHistoryCombo m_Branch;\r
+ CHistoryCombo m_Tags;\r
+ CHistoryCombo m_Version;\r
+ \r
+ DECLARE_MESSAGE_MAP()\r
+};\r
--- /dev/null
+// GitSwitch.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "GitSwitch.h"\r
+\r
+\r
+// CGitSwitch dialog\r
+\r
+IMPLEMENT_DYNAMIC(CGitSwitch, CDialog)\r
+\r
+CGitSwitch::CGitSwitch(CWnd* pParent /*=NULL*/)\r
+ : CDialog(CGitSwitch::IDD, pParent)\r
+{\r
+\r
+}\r
+\r
+CGitSwitch::~CGitSwitch()\r
+{\r
+}\r
+\r
+void CGitSwitch::DoDataExchange(CDataExchange* pDX)\r
+{\r
+ CDialog::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CGitSwitch, CDialog)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CGitSwitch message handlers\r
--- /dev/null
+#pragma once\r
+\r
+\r
+// CGitSwitch dialog\r
+\r
+class CGitSwitch : public CDialog\r
+{\r
+ DECLARE_DYNAMIC(CGitSwitch)\r
+\r
+public:\r
+ CGitSwitch(CWnd* pParent = NULL); // standard constructor\r
+ virtual ~CGitSwitch();\r
+\r
+// Dialog Data\r
+ enum { IDD = IDD_GITSWITCH };\r
+\r
+protected:\r
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support\r
+\r
+ DECLARE_MESSAGE_MAP()\r
+};\r
--- /dev/null
+// SwitchLocalBranchPage.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SwitchLocalBranchPage.h"\r
+\r
+\r
+// SwitchLocalBranchPage dialog\r
+\r
+IMPLEMENT_DYNAMIC(SwitchLocalBranchPage, CPropertyPage)\r
+\r
+SwitchLocalBranchPage::SwitchLocalBranchPage()\r
+ : CPropertyPage(SwitchLocalBranchPage::IDD)\r
+{\r
+\r
+}\r
+\r
+SwitchLocalBranchPage::~SwitchLocalBranchPage()\r
+{\r
+}\r
+\r
+void SwitchLocalBranchPage::DoDataExchange(CDataExchange* pDX)\r
+{\r
+ CPropertyPage::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(SwitchLocalBranchPage, CPropertyPage)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// SwitchLocalBranchPage message handlers\r
--- /dev/null
+#pragma once\r
+\r
+\r
+// SwitchLocalBranchPage dialog\r
+\r
+class SwitchLocalBranchPage : public CPropertyPage\r
+{\r
+ DECLARE_DYNAMIC(SwitchLocalBranchPage)\r
+\r
+public:\r
+ SwitchLocalBranchPage();\r
+ virtual ~SwitchLocalBranchPage();\r
+\r
+// Dialog Data\r
+ enum { IDD = IDD_SWITCH_LOCAL_BRANCH };\r
+\r
+protected:\r
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support\r
+\r
+ DECLARE_MESSAGE_MAP()\r
+};\r
--- /dev/null
+// SwitchTagPage.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SwitchTagPage.h"\r
+\r
+\r
+// CSwitchTagPage dialog\r
+\r
+IMPLEMENT_DYNAMIC(CSwitchTagPage, CPropertyPage)\r
+\r
+CSwitchTagPage::CSwitchTagPage()\r
+ : CPropertyPage(CSwitchTagPage::IDD)\r
+{\r
+\r
+}\r
+\r
+CSwitchTagPage::~CSwitchTagPage()\r
+{\r
+}\r
+\r
+void CSwitchTagPage::DoDataExchange(CDataExchange* pDX)\r
+{\r
+ CPropertyPage::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CSwitchTagPage, CPropertyPage)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CSwitchTagPage message handlers\r
--- /dev/null
+#pragma once\r
+\r
+\r
+// CSwitchTagPage dialog\r
+\r
+class CSwitchTagPage : public CPropertyPage\r
+{\r
+ DECLARE_DYNAMIC(CSwitchTagPage)\r
+\r
+public:\r
+ CSwitchTagPage();\r
+ virtual ~CSwitchTagPage();\r
+\r
+// Dialog Data\r
+ enum { IDD = IDD_SWITCH_TAG1 };\r
+\r
+protected:\r
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support\r
+\r
+ DECLARE_MESSAGE_MAP()\r
+};\r
--- /dev/null
+// SwitchVersionPage.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SwitchVersionPage.h"\r
+\r
+\r
+// CSwitchVersionPage dialog\r
+\r
+IMPLEMENT_DYNAMIC(CSwitchVersionPage, CPropertyPage)\r
+\r
+CSwitchVersionPage::CSwitchVersionPage()\r
+ : CPropertyPage(CSwitchVersionPage::IDD)\r
+{\r
+\r
+}\r
+\r
+CSwitchVersionPage::~CSwitchVersionPage()\r
+{\r
+}\r
+\r
+void CSwitchVersionPage::DoDataExchange(CDataExchange* pDX)\r
+{\r
+ CPropertyPage::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CSwitchVersionPage, CPropertyPage)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CSwitchVersionPage message handlers\r
--- /dev/null
+#pragma once\r
+\r
+\r
+// CSwitchVersionPage dialog\r
+\r
+class CSwitchVersionPage : public CPropertyPage\r
+{\r
+ DECLARE_DYNAMIC(CSwitchVersionPage)\r
+\r
+public:\r
+ CSwitchVersionPage();\r
+ virtual ~CSwitchVersionPage();\r
+\r
+// Dialog Data\r
+ enum { IDD = IDD_SWITCH_VERSION };\r
+\r
+protected:\r
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support\r
+\r
+ DECLARE_MESSAGE_MAP()\r
+};\r
--- /dev/null
+// SwtichRemoteBranchPage.cpp : implementation file\r
+//\r
+\r
+#include "stdafx.h"\r
+#include "TortoiseProc.h"\r
+#include "SwtichRemoteBranchPage.h"\r
+\r
+\r
+// CSwtichRemoteBranchPage dialog\r
+\r
+IMPLEMENT_DYNAMIC(CSwtichRemoteBranchPage, CPropertyPage)\r
+\r
+CSwtichRemoteBranchPage::CSwtichRemoteBranchPage()\r
+ : CPropertyPage(CSwtichRemoteBranchPage::IDD)\r
+{\r
+\r
+}\r
+\r
+CSwtichRemoteBranchPage::~CSwtichRemoteBranchPage()\r
+{\r
+}\r
+\r
+void CSwtichRemoteBranchPage::DoDataExchange(CDataExchange* pDX)\r
+{\r
+ CPropertyPage::DoDataExchange(pDX);\r
+}\r
+\r
+\r
+BEGIN_MESSAGE_MAP(CSwtichRemoteBranchPage, CPropertyPage)\r
+END_MESSAGE_MAP()\r
+\r
+\r
+// CSwtichRemoteBranchPage message handlers\r
--- /dev/null
+#pragma once\r
+\r
+\r
+// CSwtichRemoteBranchPage dialog\r
+\r
+class CSwtichRemoteBranchPage : public CPropertyPage\r
+{\r
+ DECLARE_DYNAMIC(CSwtichRemoteBranchPage)\r
+\r
+public:\r
+ CSwtichRemoteBranchPage();\r
+ virtual ~CSwtichRemoteBranchPage();\r
+\r
+// Dialog Data\r
+ enum { IDD = IDD_SWITCH_REMOTEL_BRANCH };\r
+\r
+protected:\r
+ virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support\r
+\r
+ DECLARE_MESSAGE_MAP()\r
+};\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\explorer.ico"\r
+ RelativePath=".\explorer.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\explorer.ico"\r
+ RelativePath="..\Resources\explorer.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\newfolder.ico"\r
+ RelativePath=".\newfolder.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\newfolder.ico"\r
+ RelativePath="..\Resources\newfolder.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\open.ico"\r
+ RelativePath=".\open.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\open.ico"\r
+ RelativePath="..\Resources\open.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\save.ico"\r
+ RelativePath=".\save.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\save.ico"\r
+ RelativePath="..\Resources\save.ico"\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\saveas.ico"\r
+ RelativePath=".\saveas.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\saveas.ico"\r
+ RelativePath="..\Resources\saveas.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
<File\r
- RelativePath="..\Resources\up.ico"\r
+ RelativePath=".\up.ico"\r
>\r
</File>\r
<File\r
- RelativePath=".\up.ico"\r
+ RelativePath="..\Resources\up.ico"\r
>\r
</File>\r
<File\r
>\r
</File>\r
</Filter>\r
+ <Filter\r
+ Name="branch"\r
+ >\r
+ </Filter>\r
</Filter>\r
<Filter\r
Name="Utility Dialogs"\r
>\r
</File>\r
<File\r
+ RelativePath=".\CreateBranchTagDlg.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\CreateBranchTagDlg.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\FileDiffDlg.cpp"\r
>\r
</File>\r
>\r
</File>\r
<File\r
+ RelativePath=".\GitSwitch.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\GitSwitch.h"\r
+ >\r
+ </File>\r
+ <File\r
RelativePath=".\ProgressDlg.cpp"\r
>\r
</File>\r
RelativePath=".\SVNProgressDlg.h"\r
>\r
</File>\r
+ <File\r
+ RelativePath=".\SwitchLocalBranchPage.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SwitchLocalBranchPage.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SwitchTagPage.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SwitchTagPage.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SwitchVersionPage.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SwitchVersionPage.h"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SwtichRemoteBranchPage.cpp"\r
+ >\r
+ </File>\r
+ <File\r
+ RelativePath=".\SwtichRemoteBranchPage.h"\r
+ >\r
+ </File>\r
</Filter>\r
<Filter\r
Name="Git"\r
<DebugSettings\r
Command="$(TargetPath)"\r
WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
- CommandArguments="/command:push /path:"D:\\Profiles\\b20596\\qgit4""\r
+ CommandArguments="/command:push /path:"D:\\Profiles\\b20596\\buildtest\\TortoiseGit""\r
Attach="false"\r
DebuggerType="3"\r
Remote="1"\r