Add conflict handle

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / Command.cpp

diff --git a/src/TortoiseProc/Commands/Command.cpp b/src/TortoiseProc/Commands/Command.cpp
index 5f8f059..6d4cce3 100644 (file)
--- a/src/TortoiseProc/Commands/Command.cpp
+++ b/src/TortoiseProc/Commands/Command.cpp
@@ -41,15 +41,21 @@
 #include "MergeCommand.h"\r
 #include "SwitchCommand.h"\r
 #include "ExportCommand.h"\r
-\r
-#if 0\r
 #include "AddCommand.h"\r
+#include "IgnoreCommand.h"\r
+#include "FormatPatchCommand.h"\r
+#include "ImportPatchCommand.h"\r
 #include "BlameCommand.h"\r
+#include "SettingsCommand.h"\r
+#include "ConflictEditorCommand.h"\r
+#if 0\r
+\r
+\r
 #include "CatCommand.h"\r
 #include "CheckoutCommand.h"\r
 #include "CleanupCommand.h"\r
 \r
-#include "ConflictEditorCommand.h"\r
+\r
 #include "CopyCommand.h"\r
 #include "CrashCommand.h"\r
 #include "CreatePatchCommand.h"\r
@@ -62,7 +68,7 @@
 #include "DropMoveCommand.h"\r
 \r
 #include "HelpCommand.h"\r
-#include "IgnoreCommand.h"\r
+\r
 #include "ImportCommand.h"\r
 #include "LockCommand.h"\r
 \r
@@ -82,7 +88,7 @@
 #include "RevertCommand.h"\r
 #include "RevisiongraphCommand.h"\r
 #include "RTFMCommand.h"\r
-#include "SettingsCommand.h"\r
+\r
 #include "ShowCompareCommand.h"\r
 \r
 #include "UnIgnoreCommand.h"\r
@@ -113,10 +119,12 @@ typedef enum
        cmdDropExport,\r
        cmdDropMove,\r
        cmdFetch,\r
+       cmdFormatPatch,\r
        cmdExport,\r
        cmdHelp,\r
        cmdIgnore,\r
        cmdImport,\r
+       cmdImportPatch,\r
        cmdLock,\r
        cmdLog,\r
        cmdMerge,\r
@@ -176,10 +184,12 @@ static const struct CommandInfo
        {       cmdDropExport,          _T("dropexport")                },\r
        {       cmdDropMove,            _T("dropmove")                  },\r
        {       cmdFetch,                       _T("fetch")                             },\r
+       {       cmdFormatPatch,         _T("formatpatch")               },\r
        {       cmdExport,                      _T("export")                    },\r
        {       cmdHelp,                        _T("help")                              },\r
        {       cmdIgnore,                      _T("ignore")                    },\r
        {       cmdImport,                      _T("import")                    },\r
+       {       cmdImportPatch,         _T("importpatch")               },\r
        {       cmdLock,                        _T("lock")                              },\r
        {       cmdLog,                         _T("log")                               },\r
        {       cmdMerge,                       _T("merge")                             },\r
@@ -273,11 +283,22 @@ Command * CommandServer::GetCommand(const CString& sCmd)
                return new SwitchCommand;\r
        case cmdExport:\r
                return new ExportCommand;\r
-#if 0\r
        case cmdAdd:\r
                return new AddCommand;\r
+       case cmdIgnore:\r
+               return new IgnoreCommand;\r
+       case cmdFormatPatch:\r
+               return new FormatPatchCommand;\r
+       case cmdImportPatch:\r
+               return new ImportPatchCommand;\r
        case cmdBlame:\r
                return new BlameCommand;\r
+       case cmdSettings:\r
+               return new SettingsCommand;\r
+       case cmdConflictEditor:\r
+               return new ConflictEditorCommand;\r
+#if 0\r
+\r
        case cmdCat:\r
                return new CatCommand;\r
        case cmdCheckout:\r
@@ -285,8 +306,7 @@ Command * CommandServer::GetCommand(const CString& sCmd)
        case cmdCleanup:\r
                return new CleanupCommand;\r
 \r
-       case cmdConflictEditor:\r
-               return new ConflictEditorCommand;\r
+       \r
        case cmdCopy:\r
                return new CopyCommand;\r
        case cmdCrash:\r
@@ -307,8 +327,7 @@ Command * CommandServer::GetCommand(const CString& sCmd)
 \r
        case cmdHelp:\r
                return new HelpCommand;\r
-       case cmdIgnore:\r
-               return new IgnoreCommand;\r
+\r
        case cmdImport:\r
                return new ImportCommand;\r
        case cmdLock:\r
@@ -332,8 +351,7 @@ Command * CommandServer::GetCommand(const CString& sCmd)
                return new RebuildIconCacheCommand;\r
        case cmdRelocate:\r
                return new RelocateCommand;\r
-       case cmdRemove:\r
-               return new RemoveCommand;\r
+\r
 \r
        case cmdRepoBrowser:\r
                return new RepositoryBrowserCommand;\r
@@ -341,12 +359,10 @@ Command * CommandServer::GetCommand(const CString& sCmd)
 \r
        case cmdResolve:\r
                return new ResolveCommand;\r
-       case cmdRevert:\r
-               return new RevertCommand;\r
+\r
        case cmdRevisionGraph:\r
                return new RevisionGraphCommand;\r
-       case cmdSettings:\r
-               return new SettingsCommand;\r
+\r
        case cmdShowCompare:\r
                return new ShowCompareCommand;\r
 \r