[Codelite-git] codelite git: codelite branch master updated. 03b4bea2c6a42c548535a61d309b638966f49b3c

[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  03b4bea2c6a42c548535a61d309b638966f49b3c (commit)
      from  00ed56514570199ed29fb01a45ac78606bd9e66b (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/03b4bea2c6a42c548535a61d309b638966f49b3c

commit 03b4bea2c6a42c548535a61d309b638966f49b3c
Author: eran <era...@gm...>
Date:   Thu Dec 19 09:19:24 2013 +0200

    Fixed: https://sourceforge.net/p/codelite/bugs/936/ - Subversion: don't pass extra arguments to external diff viewer

diff --git a/Subversion2/subversion_view.cpp b/Subversion2/subversion_view.cpp
index 2c022b1..a762a40 100644
--- a/Subversion2/subversion_view.cpp
+++ b/Subversion2/subversion_view.cpp
@@ -795,9 +795,10 @@ void SubversionView::OnDiff(wxCommandEvent& event)
         }

         diff_cmd << " diff ";

         

-        if ( dlg.IgnoreWhitespaces() ) {

+        if ( dlg.IgnoreWhitespaces() && !(ssd.GetFlags() & SvnUseExternalDiff) ) {

             diff_cmd << " -x -w ";

         }

+        

         diff_cmd << " -r " << from << to << " ";

         

         for (size_t i=0; i<m_selectionInfo.m_paths.GetCount(); i++) {

@@ -965,7 +966,12 @@ void SubversionView::OnItemActivated(wxTreeEvent& event)
     if ( ssd.GetFlags() & SvnUseExternalDiff ) {

         command << " --diff-cmd=\"" << ssd.GetExternalDiffViewer() << "\" ";

     }

-    command << " diff -x -w -r" << diffAgainst << " ";

+    command << " diff ";

+    if ( !(ssd.GetFlags() & SvnUseExternalDiff) ) { 

+        command << " -x -w "; 

+    }

+    command << " -r" << diffAgainst << " ";

+    

     for (size_t i=0; i<paths.GetCount(); i++) {

         command << wxT("\"") << paths.Item(i) << wxT("\" ");

     }


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

Summary of changes:
 Subversion2/subversion_view.cpp |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
codelite