Impliment commit command at log dialog when choose work copy

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / AppUtils.h

diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h
index 5d31f72..ecf3903 100644 (file)
--- a/src/TortoiseProc/AppUtils.h
+++ b/src/TortoiseProc/AppUtils.h
@@ -156,12 +156,12 @@ public:
        \r
        static bool Export(CString *BashHash=NULL);\r
        static bool CreateBranchTag(bool IsTag=TRUE,CString *CommitHash=NULL);\r
-       static bool Switch(CString *CommitHash);\r
+       static bool Switch(CString *CommitHash, CString initialRefName = CString());\r
 \r
 //     static bool IgnoreFile(CTGitPath &file, bool IsMask);\r
        static bool IgnoreFile(CTGitPathList &filelist,bool IsMask);\r
        static bool GitReset(CString *CommitHash,int type=1);\r
-       static bool ConflictEdit(CTGitPath &file,bool bAlternativeTool=false);\r
+       static bool ConflictEdit(CTGitPath &file,bool bAlternativeTool=false,bool revertTheirMy=false);\r
        /**\r
         * FUNCTION    :   FormatDateAndTime\r
         * DESCRIPTION :   Generates a displayable string from a CTime object in\r
@@ -182,7 +182,37 @@ public:
         */\r
        static CString ToRelativeTimeString(CTime time);\r
 \r
-       \r
+       static CString GetMergeTempFile(CString str,CTGitPath &merge);\r
+       static int      StashApply(CString ref);\r
+       static int      StashPop();\r
+\r
+    static bool IsSSHPutty();\r
+\r
+    static bool LaunchRemoteSetting();\r
+\r
+       static bool LaunchPAgent(CString *keyfile=NULL,CString * pRemote=NULL);\r
+\r
+       static CString GetClipboardLink();\r
+       static CString ChooseRepository(CString *path);\r
+\r
+       static bool SendPatchMail(CTGitPathList &pathlist,bool autoclose=false);\r
+       static bool SendPatchMail(CString &cmd,CString &formatpatchoutput,bool autoclose=false);\r
+\r
+       static int  SaveCommitUnicodeFile(CString &filename, CString &mesage);\r
+\r
+       static int  GetLogOutputEncode(CGit *pGit=&g_Git);\r
+\r
+       static bool Push();\r
+\r
+       static bool CreateMultipleDirectory(CString &dir);\r
+\r
+       static void RemoveTrailSlash(CString &path);\r
+\r
+       static BOOL Commit(CString bugid,BOOL bWholeProject,CString &sLogMsg,\r
+                                       CTGitPathList &pathList,\r
+                                       CTGitPathList &selectedList,\r
+                                       BOOL bSelectFilesForCommit);\r
+\r
 private:\r
        static CString PickDiffTool(const CTGitPath& file1, const CTGitPath& file2);\r
        static bool GetMimeType(const CTGitPath& file, CString& mimetype);\r