OSDN Git Service

Change Progress.h to SysProgress.h because there are two progress.h file.
authorFrank Li <lznuaa@gmail.com>
Tue, 24 Feb 2009 13:19:07 +0000 (21:19 +0800)
committerFrank Li <lznuaa@gmail.com>
Tue, 24 Feb 2009 13:19:07 +0000 (21:19 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
15 files changed:
Languages/TortoiseLang.vcproj
doc/source/en/TortoiseGit/tortoisegit.xml
doc/source/en/TortoiseGit/tsvn_dug/dug.xml
doc/source/en/TortoiseGit/tsvn_dug/dug_checkout.xml
doc/source/en/TortoiseGit/tsvn_dug/dug_commit.xml
doc/source/en/TortoiseGit/tsvn_dug/dug_log.xml
src/Git/Git.vcproj
src/TortoiseProc/Commands/Command.cpp
src/TortoiseProc/Commands/DropCopyAddCommand.cpp
src/TortoiseProc/Commands/DropCopyCommand.cpp
src/TortoiseProc/Commands/DropExportCommand.cpp
src/TortoiseProc/Commands/DropMoveCommand.cpp
src/TortoiseProc/TortoiseProc.vcproj
src/Utils/MiscUI/ProgressDlg.cpp
src/Utils/MiscUI/SysProgressDlg.h [moved from src/Utils/MiscUI/ProgressDlg.h with 96% similarity]

index 9169f2c..05e53c2 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="9,00"\r
+       Version="9.00"\r
        Name="TortoiseLangs"\r
        ProjectGUID="{EC88E7EC-3074-4841-BA45-B938D098EFF6}"\r
        RootNamespace="TortoiseLangs"\r
@@ -40,9 +40,9 @@
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
+                       Name="Release|Win32"\r
                        OutputDirectory="../bin/$(ConfigurationName)/bin"\r
-                       IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
+                       Name="Debug|x64"\r
                        OutputDirectory="../bin/$(ConfigurationName)/bin"\r
-                       IntermediateDirectory="../obj/lang/$(ConfigurationName)/"\r
+                       IntermediateDirectory="../obj/lang/$(ConfigurationName)64/"\r
                        ConfigurationType="0"\r
                        >\r
                        <Tool\r
                                Name="VCNMakeTool"\r
-                               BuildCommandLine="adfad"\r
-                               ReBuildCommandLine=""\r
-                               CleanCommandLine=""\r
+                               BuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
+                               ReBuildCommandLine="nmake /f Makefile outdir=$(OutDir)  ConfigurationName=$(ConfigurationName)"\r
+                               CleanCommandLine="nmake /f Makefile clean "\r
                                Output="TortoiseLangs.exe"\r
                                PreprocessorDefinitions="WIN32;NDEBUG"\r
                                IncludeSearchPath=""\r
index 62510f4..58447eb 100644 (file)
@@ -7,13 +7,13 @@
        <bookinfo>\r
                <edition>First</edition>\r
                <authorgroup>\r
-                       <author>\r
+                       <author>`\r
                                <firstname>Lübbe</firstname>\r
-                               <surname>Onken</surname>\r
+                               <surname>Onken (TortoiseSVN)</surname>\r
                        </author>\r
                        <author>\r
                                <firstname>Simon</firstname>\r
-                               <surname>Large</surname>\r
+                               <surname>Large (TortoiseSVN)</surname>\r
                        </author>\r
                        <author>\r
                                <firstname>Frank</firstname>\r
index 1797616..e7d8258 100644 (file)
        -->\r
        <xi:include href="./dug_checkout.xml"/>\r
        <xi:include href="./dug_commit.xml"/>\r
+       <!--\r
        <xi:include href="./dug_update.xml"/>\r
+       -->\r
        <xi:include href="./dug_conflicts.xml"/>\r
        <xi:include href="./dug_wcstatus.xml"/>\r
+       <!--\r
        <xi:include href="./dug_changelist.xml"/>\r
+       -->\r
        <xi:include href="./dug_log.xml"/>\r
        <xi:include href="./dug_diff.xml"/>\r
        <xi:include href="./dug_add.xml"/>\r
        <xi:include href="./dug_ignore.xml"/>\r
        <xi:include href="./dug_rename.xml"/>\r
        <xi:include href="./dug_revert.xml"/>\r
+       <!--\r
        <xi:include href="./dug_cleanup.xml"/>\r
+       -->\r
+       <!--\r
        <xi:include href="./dug_propertypage.xml"/>\r
+       -->\r
        <xi:include href="./dug_branchtag.xml"/>\r
        <xi:include href="./dug_merge.xml"/>\r
        <!--\r
index e347314..e023ace 100644 (file)
                </tip>\r
        </sect2>\r
        -->\r
-       <--\r
+       <!--\r
        <para>\r
                If the project contains references to external projects which you do\r
                <emphasis>not</emphasis> want checked out at the same time, use the\r
index c65aa55..624fadd 100644 (file)
@@ -63,7 +63,7 @@
                        </para>\r
                </tip>\r
                -->\r
-               <--\r
+               <!--\r
                <para>\r
                        If you have modified files which have been included from a different\r
                        repository using <literal>svn:externals</literal>, those changes cannot\r
index 9303877..13dd177 100644 (file)
@@ -34,8 +34,7 @@
                                        start of the log message.\r
                                </para>\r
                                <para>\r
-                                       Lines shown in blue indicate that something has been copied\r
-                                       to this development line (perhaps from a branch).\r
+                                       Lines shown in bold indicate that that is HEAD commit.\r
                                </para>\r
                        </listitem>\r
                        <listitem>\r
@@ -74,6 +73,7 @@
                                                From the property page\r
                                        </para>\r
                                </listitem>\r
+                               <!--\r
                                <listitem>\r
                                        <para>\r
                                                From the Progress dialog after an update\r
@@ -81,6 +81,7 @@
                                                which were changed since your last update\r
                                        </para>\r
                                </listitem>\r
+                               -->\r
                        </itemizedlist>\r
                </para>\r
        </sect2>\r
                </para>\r
                <para>\r
                        <graphic fileref="../images/ActionReplacedIcon.png"/>\r
-                       If a revision replaced a file or directory, the\r
+                       If a revision replaced(rename) a file, the\r
                        <emphasis>replaced</emphasis> icon is shown in the fourth column.\r
                </para>\r
        </sect2>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Compare and blame with working BASE</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Show changes as unified diff</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Compare and blame with previous revision</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Save revision to...</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Open / Open with...</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Browse repository</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
-                                       <term>Create branch/tag from revision</term>\r
+                                       <term>Create branch from revision</term>\r
                                        <listitem>\r
                                                <para>\r
-                                                       Create a branch or tag from a selected revision.\r
-                                                       This is useful e.g. if you forgot to create a tag and already\r
-                                                       committed some changes which weren't supposed to get into\r
-                                                       that release.\r
+                                                       Create a branch from a selected revision.\r
+                                                       This is useful e.g. \r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
                                <varlistentry>\r
-                                       <term>Update item to revision</term>\r
+                                       <term>Create tag from revision</term>\r
+                                       <listitem>\r
+                                               <para>\r
+                                                       Create a tag from a selected revision.\r
+                                                       This is useful e.g. \r
+                                               </para>\r
+                                       </listitem>\r
+                               </varlistentry>\r
+                               <varlistentry>\r
+                                       <term>Switch\Checkout to revision</term>\r
                                        <listitem>\r
                                                <para>\r
                                                        Update your working copy to the selected revision.\r
                                                        Useful if you want to have your working copy reflect\r
                                                        a time in the past, or if there have been further commits to\r
                                                        the repository and you want to update your working copy one\r
-                                                       step at a time. It is best to update a whole directory\r
-                                                       in your working copy, not just one file, otherwise your\r
-                                                       working copy could be inconsistent.\r
+                                                       step at a time. \r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Revert changes from this revision</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Revert to this revision</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Merge revision to...</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Checkout...</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Export...</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Edit author / log message</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Show revision properties</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Copy to clipboard</term>\r
                                        <listitem>\r
                                                        difference tool. The default Diff-Tool is TortoiseMerge\r
                                                        which is supplied with TortoiseGit.\r
                                                </para>\r
+                                               <!--\r
                                                <para>\r
                                                        If you select this option for a folder, a further dialog pops\r
                                                        up listing the changed files and offering you further\r
                                                        diff options. Read more about the Compare Revisions\r
                                                        dialog in <xref linkend="tsvn-dug-compare-revs"/>.\r
                                                </para>\r
+                                               -->\r
                                        </listitem>\r
                                </varlistentry>\r
+                               <!--\r
                                <varlistentry>\r
                                        <term>Blame revisions</term>\r
                                        <listitem>\r
                                                </para>\r
                                        </listitem>\r
                                </varlistentry>\r
+                               -->\r
                                <varlistentry>\r
                                        <term>Show differences as unified diff</term>\r
                                        <listitem>\r
                                </varlistentry>\r
                        </variablelist>\r
                </para>\r
+               <!--\r
                <para>\r
                        If you select two or more revisions (using the usual\r
                        <keycap>Ctrl</keycap> or <keycap>Shift</keycap> modifiers),\r
                        which were made in the selected revisions. This is the easiest\r
                        way to rollback a group of revisions in one go.\r
                </para>\r
+               -->\r
                <para>\r
                        You can also choose to merge the selected revisions to another\r
                        working copy, as described above.\r
index c957810..f438b99 100644 (file)
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
-                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
-                       UseOfATL="1"\r
                        CharacterSet="1"\r
+                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
+                               Optimization="2"\r
+                               EnableIntrinsicFunctions="true"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
+                               RuntimeLibrary="2"\r
+                               EnableFunctionLevelLinking="true"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
+                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                        />\r
                </Configuration>\r
                <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
-                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)"\r
+                       Name="Debug|x64"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)64\bin"\r
+                       IntermediateDirectory="..\..\obj\git\$(ConfigurationName)64"\r
                        ConfigurationType="4"\r
                        UseOfMFC="2"\r
+                       UseOfATL="1"\r
                        CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
                        >\r
                        <Tool\r
                                Name="VCPreBuildEventTool"\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
+                               TargetEnvironment="3"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
+                               Optimization="0"\r
                                AdditionalIncludeDirectories="../utils"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
                                UsePrecompiledHeader="2"\r
                                WarningLevel="3"\r
                                DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLibrarianTool"\r
-                               AdditionalLibraryDirectories=""\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Debug|x64"\r
+                                       Name="Release|Win32"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
-                                       Name="Release|Win32"\r
+                                       Name="Debug|x64"\r
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
index 78b6c77..11898f6 100644 (file)
 #include "CleanupCommand.h"\r
 #include "RebaseCommand.h"\r
 #include "ResolveCommand.h"\r
+#include "DropMoveCommand.h"\r
+#include "DropCopyAddCommand.h"\r
+#include "DropCopyCommand.h"\r
+#include "DropExportCommand.h"\r
+#include "HelpCommand.h"\r
+\r
 #if 0\r
 \r
 \r
 \r
 #include "DelUnversionedCommand.h"\r
 \r
-#include "DropCopyAddCommand.h"\r
-#include "DropCopyCommand.h"\r
-#include "DropExportCommand.h"\r
-#include "DropMoveCommand.h"\r
 \r
-#include "HelpCommand.h"\r
+\r
+\r
+\r
 \r
 #include "ImportCommand.h"\r
 #include "LockCommand.h"\r
@@ -308,6 +312,16 @@ Command * CommandServer::GetCommand(const CString& sCmd)
                return new RebaseCommand;\r
        case cmdResolve:\r
                return new ResolveCommand;\r
+       case cmdDropMove:\r
+               return new DropMoveCommand;\r
+//     case cmdDropCopy:\r
+//             return new DropCopyCommand;\r
+//     case cmdDropCopyAdd:\r
+//             return new DropCopyAddCommand;\r
+//     case cmdDropExport:\r
+//             return new DropExportCommand;\r
+       case cmdHelp:\r
+               return new HelpCommand;\r
 #if 0\r
 \r
        case cmdCat:\r
@@ -326,25 +340,12 @@ Command * CommandServer::GetCommand(const CString& sCmd)
        case cmdDelUnversioned:\r
                return new DelUnversionedCommand;\r
 \r
-       case cmdDropCopy:\r
-               return new DropCopyCommand;\r
-       case cmdDropCopyAdd:\r
-               return new DropCopyAddCommand;\r
-       case cmdDropExport:\r
-               return new DropExportCommand;\r
-       case cmdDropMove:\r
-               return new DropMoveCommand;\r
 \r
-       case cmdHelp:\r
-               return new HelpCommand;\r
 \r
        case cmdImport:\r
                return new ImportCommand;\r
        case cmdLock:\r
                return new LockCommand;\r
-\r
-       case cmdMerge:\r
-               return new MergeCommand;\r
        case cmdMergeAll:\r
                return new MergeAllCommand;\r
        case cmdPasteCopy:\r
@@ -361,20 +362,12 @@ Command * CommandServer::GetCommand(const CString& sCmd)
                return new RebuildIconCacheCommand;\r
        case cmdRelocate:\r
                return new RelocateCommand;\r
-\r
-\r
        case cmdRepoBrowser:\r
                return new RepositoryBrowserCommand;\r
-\r
-\r
-\r
-\r
        case cmdRevisionGraph:\r
                return new RevisionGraphCommand;\r
-\r
        case cmdShowCompare:\r
                return new ShowCompareCommand;\r
-\r
        case cmdUnIgnore:\r
                return new UnIgnoreCommand;\r
        case cmdUnlock:\r
index 2b9df16..0f55bfb 100644 (file)
@@ -25,6 +25,7 @@
 bool DropCopyAddCommand::Execute()\r
 {\r
        bool bRet = false;\r
+#if 0\r
        CString droppath = parser.GetVal(_T("droptarget"));\r
        if (CTSVNPath(droppath).IsAdminDir())\r
                return FALSE;\r
@@ -105,5 +106,6 @@ bool DropCopyAddCommand::Execute()
        progDlg.SetProjectProperties(props);\r
        progDlg.DoModal();\r
        bRet = !progDlg.DidErrorsOccur();\r
+#endif\r
        return bRet;\r
 }\r
index 97e9277..d27c6db 100644 (file)
 #include "StdAfx.h"\r
 #include "DropCopyCommand.h"\r
 \r
-#include "SVNProgressDlg.h"\r
+#include "SysProgressDlg.h"\r
 #include "ProgressDlg.h"\r
 #include "MessageBox.h"\r
 #include "RenameDlg.h"\r
-#include "SVN.h"\r
+#include "Git.h"\r
 #include "ShellUpdater.h"\r
 \r
 bool DropCopyCommand::Execute()\r
 {\r
+#if 0\r
        CString sDroppath = parser.GetVal(_T("droptarget"));\r
-       if (CTSVNPath(sDroppath).IsAdminDir())\r
+       if (CTGitPath(sDroppath).IsAdminDir())\r
                return FALSE;\r
-       SVN svn;\r
+       \r
        unsigned long count = 0;\r
        CString sNewName;\r
        pathList.RemoveAdminPaths();\r
@@ -108,5 +109,6 @@ bool DropCopyCommand::Execute()
                        return false;\r
                }\r
        }\r
+#endif\r
        return true;\r
 }\r
index 9022798..3c98f4a 100644 (file)
 #include "StdAfx.h"\r
 #include "DropExportCommand.h"\r
 #include "MessageBox.h"\r
-#include "SVN.h"\r
-#include "SVNAdminDir.h"\r
+#include "Git.h"\r
+#include "GitAdminDir.h"\r
 #include "DirFileEnum.h"\r
-#include "ProgressDlg.h"\r
+#include "SysProgressDlg.h"\r
 \r
 bool DropExportCommand::Execute()\r
 {\r
        bool bRet = true;\r
+#if 0\r
        CString droppath = parser.GetVal(_T("droptarget"));\r
-       if (CTSVNPath(droppath).IsAdminDir())\r
+       if (CTGitPath(droppath).IsAdminDir())\r
                return false;\r
+\r
        SVN svn;\r
        if ((pathList.GetCount() == 1)&&\r
                (pathList[0].IsEquivalentTo(CTSVNPath(droppath))))\r
@@ -104,5 +106,6 @@ bool DropExportCommand::Execute()
                        }\r
                }\r
        }\r
+#endif\r
        return bRet;\r
 }\r
index ba7fb51..84415cd 100644 (file)
 #include "StdAfx.h"\r
 #include "DropMoveCommand.h"\r
 \r
-#include "ProgressDlg.h"\r
+#include "SysProgressDlg.h"\r
 #include "MessageBox.h"\r
-#include "SVN.h"\r
+#include "Git.h"\r
 #include "RenameDlg.h"\r
 #include "ShellUpdater.h"\r
+#include "commonresource.h"\r
 \r
 bool DropMoveCommand::Execute()\r
 {\r
        CString droppath = parser.GetVal(_T("droptarget"));\r
-       if (CTSVNPath(droppath).IsAdminDir())\r
+       CString ProjectTop;\r
+       if (CTGitPath(droppath).HasAdminDir(&ProjectTop))\r
                return FALSE;\r
-       SVN svn;\r
+       \r
+       if (ProjectTop != g_Git.m_CurrentDir )\r
+       {\r
+               CMessageBox::Show(NULL,_T("Target and source must be the same git repository"),_T("TortoiseGit"),MB_OK);\r
+               return FALSE;\r
+       }\r
+\r
+       droppath.Right(droppath.GetLength()-ProjectTop.GetLength()-1);\r
+\r
        unsigned long count = 0;\r
        pathList.RemoveAdminPaths();\r
        CString sNewName;\r
+\r
        if ((parser.HasKey(_T("rename")))&&(pathList.GetCount()==1))\r
        {\r
                // ask for a new name of the source item\r
@@ -49,7 +60,7 @@ bool DropMoveCommand::Execute()
                        sNewName = renDlg.m_name;\r
                } while(sNewName.IsEmpty() || PathFileExists(droppath+_T("\\")+sNewName));\r
        }\r
-       CProgressDlg progress;\r
+       CSysProgressDlg progress;\r
        if (progress.IsValid())\r
        {\r
                progress.SetTitle(IDS_PROC_MOVING);\r
@@ -59,11 +70,11 @@ bool DropMoveCommand::Execute()
        }\r
        for(int nPath = 0; nPath < pathList.GetCount(); nPath++)\r
        {\r
-               CTSVNPath destPath;\r
+               CTGitPath destPath;\r
                if (sNewName.IsEmpty())\r
-                       destPath = CTSVNPath(droppath+_T("\\")+pathList[nPath].GetFileOrDirectoryName());\r
+                       destPath = CTGitPath(droppath+_T("\\")+pathList[nPath].GetFileOrDirectoryName());\r
                else\r
-                       destPath = CTSVNPath(droppath+_T("\\")+sNewName);\r
+                       destPath = CTGitPath(droppath+_T("\\")+sNewName);\r
                if (destPath.Exists())\r
                {\r
                        CString name = pathList[nPath].GetFileOrDirectoryName();\r
@@ -79,30 +90,26 @@ bool DropMoveCommand::Execute()
                        }\r
                        destPath.SetFromWin(droppath+_T("\\")+dlg.m_name);\r
                } \r
-               if (!svn.Move(CTSVNPathList(pathList[nPath]), destPath, FALSE))\r
+               CString cmd,out;\r
+               \r
+               cmd.Format(_T("git.exe mv \"%s\" \"%s\""),pathList[nPath].GetGitPathString(),destPath.GetGitPathString());\r
+               if(g_Git.Run(cmd,&out,CP_OEMCP))\r
                {\r
-                       if (svn.Err && (svn.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE ||\r
-                               svn.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))\r
+                       if (CMessageBox::Show(hwndExplorer, out, _T("TortoiseGit"), MB_YESNO)==IDYES)\r
                        {\r
-                               // file/folder seems to have local modifications. Ask the user if\r
-                               // a force is requested.\r
-                               CString temp = svn.GetLastErrorMessage();\r
-                               CString sQuestion(MAKEINTRESOURCE(IDS_PROC_FORCEMOVE));\r
-                               temp += _T("\n") + sQuestion;\r
-                               if (CMessageBox::Show(hwndExplorer, temp, _T("TortoiseSVN"), MB_YESNO)==IDYES)\r
-                               {\r
+#if 0\r
                                        if (!svn.Move(CTSVNPathList(pathList[nPath]), destPath, TRUE))\r
                                        {\r
                                                CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
                                                return FALSE;           //get out of here\r
                                        }\r
                                        CShellUpdater::Instance().AddPathForUpdate(destPath);\r
-                               }\r
+#endif\r
                        }\r
                        else\r
                        {\r
-                               TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage());\r
-                               CMessageBox::Show(hwndExplorer, svn.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);\r
+                               //TRACE(_T("%s\n"), (LPCTSTR)svn.GetLastErrorMessage());\r
+                               CMessageBox::Show(hwndExplorer, _T("Cancel"), _T("TortoiseGit"), MB_ICONERROR);\r
                                return FALSE;           //get out of here\r
                        }\r
                } \r
index 2594c42..1b90dc1 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\explorer.ico"\r
+                               RelativePath="..\Resources\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\explorer.ico"\r
+                               RelativePath=".\explorer.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\newfolder.ico"\r
+                               RelativePath="..\Resources\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\newfolder.ico"\r
+                               RelativePath=".\newfolder.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\open.ico"\r
+                               RelativePath="..\Resources\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\open.ico"\r
+                               RelativePath=".\open.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\save.ico"\r
+                               RelativePath="..\Resources\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\save.ico"\r
+                               RelativePath=".\save.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\saveas.ico"\r
+                               RelativePath="..\Resources\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\saveas.ico"\r
+                               RelativePath=".\saveas.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\up.ico"\r
+                               RelativePath="..\Resources\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Resources\up.ico"\r
+                               RelativePath=".\up.ico"\r
                                >\r
                        </File>\r
                        <File\r
                                Name="Rename"\r
                                >\r
                                <File\r
+                                       RelativePath=".\Commands\DropMoveCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DropMoveCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\Commands\RenameCommand.cpp"\r
                                        >\r
                                </File>\r
                                Name="Export"\r
                                >\r
                                <File\r
+                                       RelativePath=".\Commands\DropExportCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DropExportCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\Commands\ExportCommand.cpp"\r
                                        >\r
                                </File>\r
                                        >\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="Copy"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\DropCopyAddCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DropCopyAddCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DropCopyCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DropCopyCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Utility Dialogs"\r
index 66676d0..05024a2 100644 (file)
@@ -17,9 +17,9 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #include "stdafx.h"\r
-#include "ProgressDlg.h"\r
+#include "SysProgressDlg.h"\r
 \r
-CProgressDlg::CProgressDlg() :\r
+CSysProgressDlg::CSysProgressDlg() :\r
                        m_pIDlg(NULL),\r
                    m_bValid(false),                    //not valid by default\r
             m_isVisible(false),\r
@@ -28,7 +28,7 @@ CProgressDlg::CProgressDlg() :
        EnsureValid();\r
 }\r
 \r
-CProgressDlg::~CProgressDlg()\r
+CSysProgressDlg::~CSysProgressDlg()\r
 {\r
     if (m_bValid)\r
     {\r
@@ -39,7 +39,7 @@ CProgressDlg::~CProgressDlg()
     }\r
 }\r
 \r
-bool CProgressDlg::EnsureValid()\r
+bool CSysProgressDlg::EnsureValid()\r
 {\r
        if (!m_bValid)\r
        {\r
@@ -53,7 +53,7 @@ bool CProgressDlg::EnsureValid()
        }\r
        return m_bValid;\r
 }\r
-void CProgressDlg::SetTitle(LPCTSTR szTitle)\r
+void CSysProgressDlg::SetTitle(LPCTSTR szTitle)\r
 {\r
     USES_CONVERSION;\r
     if (m_bValid)\r
@@ -61,12 +61,12 @@ void CProgressDlg::SetTitle(LPCTSTR szTitle)
                m_pIDlg->SetTitle(T2COLE(szTitle));\r
        }\r
 }\r
-void CProgressDlg::SetTitle ( UINT idTitle)\r
+void CSysProgressDlg::SetTitle ( UINT idTitle)\r
 {\r
        SetTitle(CString(MAKEINTRESOURCE(idTitle)));\r
 }\r
 \r
-void CProgressDlg::SetLine(DWORD dwLine, LPCTSTR szText, bool bCompactPath /* = false */)\r
+void CSysProgressDlg::SetLine(DWORD dwLine, LPCTSTR szText, bool bCompactPath /* = false */)\r
 {\r
        USES_CONVERSION;\r
        if (m_bValid)\r
@@ -76,13 +76,13 @@ void CProgressDlg::SetLine(DWORD dwLine, LPCTSTR szText, bool bCompactPath /* =
 }\r
 \r
 #ifdef _MFC_VER\r
-void CProgressDlg::SetCancelMsg ( UINT idMessage )\r
+void CSysProgressDlg::SetCancelMsg ( UINT idMessage )\r
 {\r
        SetCancelMsg(CString(MAKEINTRESOURCE(idMessage)));\r
 }\r
 #endif // _MFC_VER\r
 \r
-void CProgressDlg::SetCancelMsg(LPCTSTR szMessage)\r
+void CSysProgressDlg::SetCancelMsg(LPCTSTR szMessage)\r
 {\r
     USES_CONVERSION;\r
        if (m_bValid)\r
@@ -91,7 +91,7 @@ void CProgressDlg::SetCancelMsg(LPCTSTR szMessage)
        }\r
 }\r
 \r
-void CProgressDlg::SetAnimation(HINSTANCE hinst, UINT uRsrcID)\r
+void CSysProgressDlg::SetAnimation(HINSTANCE hinst, UINT uRsrcID)\r
 {\r
        if (m_bValid)\r
        {\r
@@ -99,7 +99,7 @@ void CProgressDlg::SetAnimation(HINSTANCE hinst, UINT uRsrcID)
        }\r
 }\r
 #ifdef _MFC_VER\r
-void CProgressDlg::SetAnimation(UINT uRsrcID)\r
+void CSysProgressDlg::SetAnimation(UINT uRsrcID)\r
 {\r
        if (m_bValid)\r
        {\r
@@ -107,7 +107,7 @@ void CProgressDlg::SetAnimation(UINT uRsrcID)
        }\r
 }\r
 #endif\r
-void CProgressDlg::SetTime(bool bTime /* = true */)\r
+void CSysProgressDlg::SetTime(bool bTime /* = true */)\r
 {\r
     m_dwDlgFlags &= ~(PROGDLG_NOTIME | PROGDLG_AUTOTIME);\r
 \r
@@ -117,7 +117,7 @@ void CProgressDlg::SetTime(bool bTime /* = true */)
         m_dwDlgFlags |= PROGDLG_NOTIME;\r
 }\r
 \r
-void CProgressDlg::SetShowProgressBar(bool bShow /* = true */)\r
+void CSysProgressDlg::SetShowProgressBar(bool bShow /* = true */)\r
 {\r
     if (bShow)\r
         m_dwDlgFlags &= ~PROGDLG_NOPROGRESSBAR;\r
@@ -125,19 +125,19 @@ void CProgressDlg::SetShowProgressBar(bool bShow /* = true */)
         m_dwDlgFlags |= PROGDLG_NOPROGRESSBAR;\r
 }\r
 #ifdef _MFC_VER\r
-HRESULT CProgressDlg::ShowModal (CWnd* pwndParent)\r
+HRESULT CSysProgressDlg::ShowModal (CWnd* pwndParent)\r
 {\r
        EnsureValid();\r
        return ShowModal(pwndParent->GetSafeHwnd());\r
 }\r
 \r
-HRESULT CProgressDlg::ShowModeless(CWnd* pwndParent)\r
+HRESULT CSysProgressDlg::ShowModeless(CWnd* pwndParent)\r
 {\r
        EnsureValid();\r
        return ShowModeless(pwndParent->GetSafeHwnd());\r
 }\r
 \r
-void CProgressDlg::FormatPathLine ( DWORD dwLine, UINT idFormatText, ...)\r
+void CSysProgressDlg::FormatPathLine ( DWORD dwLine, UINT idFormatText, ...)\r
 {\r
        va_list args;\r
        va_start(args, idFormatText);\r
@@ -149,7 +149,7 @@ void CProgressDlg::FormatPathLine ( DWORD dwLine, UINT idFormatText, ...)
        va_end(args);\r
 }\r
 \r
-void CProgressDlg::FormatNonPathLine(DWORD dwLine, UINT idFormatText, ...)\r
+void CSysProgressDlg::FormatNonPathLine(DWORD dwLine, UINT idFormatText, ...)\r
 {\r
        va_list args;\r
        va_start(args, idFormatText);\r
@@ -162,7 +162,7 @@ void CProgressDlg::FormatNonPathLine(DWORD dwLine, UINT idFormatText, ...)
 }\r
 \r
 #endif\r
-HRESULT CProgressDlg::ShowModal (HWND hWndParent)\r
+HRESULT CSysProgressDlg::ShowModal (HWND hWndParent)\r
 {\r
        EnsureValid();\r
        HRESULT hr;\r
@@ -183,7 +183,7 @@ HRESULT CProgressDlg::ShowModal (HWND hWndParent)
        return E_FAIL;\r
 }\r
 \r
-HRESULT CProgressDlg::ShowModeless(HWND hWndParent)\r
+HRESULT CSysProgressDlg::ShowModeless(HWND hWndParent)\r
 {\r
        EnsureValid();\r
        HRESULT hr = E_FAIL;\r
@@ -217,7 +217,7 @@ HRESULT CProgressDlg::ShowModeless(HWND hWndParent)
        return hr;\r
 }\r
 \r
-void CProgressDlg::SetProgress(DWORD dwProgress, DWORD dwMax)\r
+void CSysProgressDlg::SetProgress(DWORD dwProgress, DWORD dwMax)\r
 {\r
        if (m_bValid)\r
        {\r
@@ -226,7 +226,7 @@ void CProgressDlg::SetProgress(DWORD dwProgress, DWORD dwMax)
 }\r
 \r
 \r
-void CProgressDlg::SetProgress64(ULONGLONG u64Progress, ULONGLONG u64ProgressMax)\r
+void CSysProgressDlg::SetProgress64(ULONGLONG u64Progress, ULONGLONG u64ProgressMax)\r
 {\r
        if (m_bValid)\r
        {\r
@@ -235,7 +235,7 @@ void CProgressDlg::SetProgress64(ULONGLONG u64Progress, ULONGLONG u64ProgressMax
 }\r
 \r
 \r
-bool CProgressDlg::HasUserCancelled()\r
+bool CSysProgressDlg::HasUserCancelled()\r
 {\r
        if (m_bValid)\r
        {\r
@@ -244,7 +244,7 @@ bool CProgressDlg::HasUserCancelled()
        return FALSE;\r
 }\r
 \r
-void CProgressDlg::Stop()\r
+void CSysProgressDlg::Stop()\r
 {\r
     if ((m_isVisible)&&(m_bValid))\r
     {\r
@@ -272,7 +272,7 @@ void CProgressDlg::Stop()
     }\r
 }\r
 \r
-void CProgressDlg::ResetTimer()\r
+void CSysProgressDlg::ResetTimer()\r
 {\r
        if (m_bValid)\r
        {\r
similarity index 96%
rename from src/Utils/MiscUI/ProgressDlg.h
rename to src/Utils/MiscUI/SysProgressDlg.h
index 2398ac9..95aa626 100644 (file)
  * \remark you need to call AfxOleInit() before using this class, preferably in\r
  * your app's InitInistance() method.\r
  */\r
-class CProgressDlg  \r
+class CSysProgressDlg  \r
 {\r
 public:\r
-    CProgressDlg();\r
-    ~CProgressDlg();\r
+    CSysProgressDlg();\r
+    ~CSysProgressDlg();\r
 \r
        /**\r
         * sets the title of the progress dialog box.\r