X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FGit%2FGit.h;h=487c854bbab571b8e4841527865b9e0a45d1bf03;hp=f1f0d0982e9b85edd5ef730660be8d15eb2dc802;hb=9be52fb6cac4a5460b6db9fb63f84d1e5c54952f;hpb=103b96ec7f3fc1627384365c22fb7c98ebf31013;ds=sidebyside

diff --git a/src/Git/Git.h b/src/Git/Git.h
index f1f0d09..487c854 100644
--- a/src/Git/Git.h
+++ b/src/Git/Git.h
@@ -1,31 +1,115 @@
 #pragma once
+#include "GitType.h"
 #include "GitRev.h"
 #include "GitStatus.h"
+#include "GitAdminDir.h"
 
-enum
+class CGitCall
 {
-	GIT_SUCCESS=0,
-	GIT_ERROR_OPEN_PIP,
-	GIT_ERROR_CREATE_PROCESS
+public:
+	CGitCall(){}
+	CGitCall(CString cmd):m_Cmd(cmd){}
+
+	CString			GetCmd()const{return m_Cmd;}
+	void			SetCmd(CString cmd){m_Cmd=cmd;}
+
+	//This function is called when command output data is available.
+	//When this function returns 'true' the git command should be aborted.
+	//This behavior is not implemented yet.
+	virtual bool	OnOutputData(const BYTE* data, size_t size)=0;
+	virtual void	OnEnd(){}
+
+private:
+	CString m_Cmd;
+
 };
+
+class CTGitPath;
+
 class CGit
 {
+private:
+	GitAdminDir m_GitDir;
 public:
+	static BOOL CheckMsysGitDir();
+	static CString ms_LastMsysGitDir;	// the last msysgitdir added to the path, blank if none
 
+//	static CString m_MsysGitPath;
 	CGit(void);
 	~CGit(void);
-	int Run(CString cmd, CString* output);
+	
+	int Run(CString cmd, CString* output,int code);
+	int Run(CString cmd, BYTE_VECTOR *byte_array);
+	int Run(CGitCall* pcall);
+
+	int RunAsync(CString cmd,PROCESS_INFORMATION *pi, HANDLE* hRead, CString *StdioFile=NULL);
 	int RunLogFile(CString cmd, CString &filename);
 	CString GetUserName(void);
 	CString GetUserEmail(void);
 	CString GetCurrentBranch(void);
+	// read current branch name from HEAD file, returns 0 on success, -1 on failure, 1 detached (branch name "HEAD" returned)
+	int GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut);
+	BOOL CheckCleanWorkTree();
+	int Revert(CTGitPath &path,bool keep=true);
+	int Revert(CTGitPathList &list,bool keep=true);
+
+	bool SetCurrentDir(CString path)
+	{
+		return m_GitDir.HasAdminDir(path,&m_CurrentDir);
+	}
 	CString m_CurrentDir;
-	int GetLog(CString& logOut);
+
+	typedef enum
+	{
+		BRANCH_LOCAL=0x1,
+		BRANCH_REMOTE=0x2,
+		BRANCH_ALL=BRANCH_LOCAL|BRANCH_REMOTE,
+	}BRANCH_TYPE;
+
+	typedef enum
+	{
+		LOG_INFO_STAT=0x1,
+		LOG_INFO_FILESTATE=0x2,
+		LOG_INFO_PATCH=0x4,
+		LOG_INFO_FULLHISTORY=0x8,
+		LOG_INFO_BOUNDARY=0x10,
+        LOG_INFO_ALL_BRANCH=0x20,
+		LOG_INFO_ONLY_HASH=0x40,
+		LOG_INFO_DETECT_RENAME=0x80,
+		LOG_INFO_DETECT_COPYRENAME=0x100,
+		LOG_INFO_FIRST_PARENT = 0x200,
+		LOG_INFO_NO_MERGE = 0x400,
+		LOG_INFO_FOLLOW = 0x800
+	}LOG_INFO_MASK;
+
+	int GetRemoteList(STRING_VECTOR &list);
+	int GetBranchList(STRING_VECTOR &list, int *Current,BRANCH_TYPE type=BRANCH_LOCAL);
+	int GetTagList(STRING_VECTOR &list);
+	int GetMapHashToFriendName(MAP_HASH_NAME &map);
+	
+	//hash is empty means all. -1 means all
+
+	int GetLog(CGitCall* pgitCall, CString &hash, CTGitPath *path = NULL,int count=-1,int InfoMask=LOG_INFO_STAT|LOG_INFO_FILESTATE|LOG_INFO_BOUNDARY|LOG_INFO_DETECT_COPYRENAME,
+								CString *from=NULL,CString *to=NULL);
+	int GetLog(BYTE_VECTOR& logOut,CString &hash, CTGitPath *path = NULL,int count=-1,int InfoMask=LOG_INFO_STAT|LOG_INFO_FILESTATE|LOG_INFO_BOUNDARY|LOG_INFO_DETECT_COPYRENAME,
+								CString *from=NULL,CString *to=NULL);
+
+	BOOL EnumFiles(const char *pszProjectPath, const char *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData);
+
 	git_revnum_t GetHash(CString &friendname);
+
+	int BuildOutputFormat(CString &format,bool IsFull=TRUE);
+	//int GetShortLog(CString &log,CTGitPath * path=NULL, int count =-1);
+	static void StringAppend(CString *str,BYTE *p,int code=CP_UTF8,int length=-1);
+
+	BOOL IsInitRepos();
+	int ListConflictFile(CTGitPathList &list,CTGitPath *path=NULL);
 	
 };
 extern void GetTempPath(CString &path);
 extern CString GetTempFile();
 
 
-extern CGit g_Git;
\ No newline at end of file
+extern CGit g_Git;
+
+inline static BOOL wgEnumFiles(const char *pszProjectPath, const char *pszSubPath, unsigned int nFlags, WGENUMFILECB *pEnumCb, void *pUserData) { return g_Git.EnumFiles(pszProjectPath, pszSubPath, nFlags, pEnumCb, pUserData); }