[Codelite-git] codelite git: codelite branch master updated. 98fa2214474bc9a56991088ba9cb8a6fe900b1b2

[Eran I. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".

The branch, master has been updated
       via  98fa2214474bc9a56991088ba9cb8a6fe900b1b2 (commit)
      from  334340fd6f27983b2a0922307be26eab6527e4b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/98fa2214474bc9a56991088ba9cb8a6fe900b1b2

commit 98fa2214474bc9a56991088ba9cb8a6fe900b1b2
Author: Eran <era...@gm...>
Date:   Fri Dec 20 18:30:49 2013 +0200

    Use wxDELETE instead of delete
    Prompt the user when git terminates with the "*** please tell me who you are" message

diff --git a/LiteEditor.workspace b/LiteEditor.workspace
index 8b5cb81..0a5eb45 100644
--- a/LiteEditor.workspace
+++ b/LiteEditor.workspace
@@ -43,7 +43,7 @@
   </Environment>
   <Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/>
   <BuildMatrix>
-    <WorkspaceConfiguration Name="Win Release Unicode" Selected="no">
+    <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes">
       <Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/>
       <Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/>
       <Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/>
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 0ecfcc6..bb121ae 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -1326,7 +1326,7 @@ resources.cpp: resources.xrc
         <Library Value="liblibclang.dll"/>
       </Linker>
       <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="yes"/>
-      <General OutputFile="$(IntermediateDirectory)/codelite-dbg.exe" IntermediateDirectory="./Debug" Command="./codelite-dbg.exe" CommandArguments="-b . --no-plugins" UseSeparateDebugArgs="yes" DebugArguments="-b . --no-plugins" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
+      <General OutputFile="$(IntermediateDirectory)/codelite-dbg.exe" IntermediateDirectory="./Debug" Command="./codelite-dbg.exe" CommandArguments="-b .  " UseSeparateDebugArgs="no" DebugArguments="-b . --no-plugins" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
       <Environment EnvVarSetName="Default" DbgSetName="">
         <![CDATA[PATH=../sdk/clang/lib;$(WXWIN)\lib\gcc_dll;$(PATH)]]>
       </Environment>
diff --git a/git/git.cpp b/git/git.cpp
index f9a1db7..a001150 100644
--- a/git/git.cpp
+++ b/git/git.cpp
@@ -1445,7 +1445,11 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
              ga.action != gitDiffRepoShow )

         

         {

-            if ( tmpOutput.EndsWith("password:") || tmpOutput.Contains("password for") ) {

+            if ( tmpOutput.Contains("*** please tell me who you are") ) {

+                ::wxMessageBox(output, "git", wxICON_ERROR|wxCENTER|wxOK, EventNotifier::Get()->TopFrame());

+                m_process->Terminate();

+                

+            } else if ( tmpOutput.EndsWith("password:") || tmpOutput.Contains("password for") ) {

 

                 // Password is required

                 wxString pass = ::wxGetPasswordFromUser(output);

@@ -1485,9 +1489,10 @@ void GitPlugin::OnProcessOutput(wxCommandEvent &event)
                 }

             }

         }

-        delete ped;

+        wxDELETE(ped);

     }

 }

+

 /*******************************************************************************/

 void GitPlugin::InitDefaults()

 {


-----------------------------------------------------------------------

Summary of changes:
 LiteEditor.workspace          |    2 +-
 LiteEditor/LiteEditor.project |    2 +-
 git/git.cpp                   |    9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
codelite