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