src/TortoiseMerge/DiffData.cpp

   1 // TortoiseGitMerge - a Diff/Patch program
   2
   3 // Copyright (C) 2006-2014 - TortoiseSVN
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19 #include "stdafx.h"
  20 #pragma warning(push)
  21 #include "diff.h"
  22 #pragma warning(pop)
  23 #include "TempFile.h"
  24 #include "registry.h"
  25 #include "resource.h"
  26 #include "DiffData.h"
  27 #include "UnicodeUtils.h"
  28 #include "svn_dso.h"
  29 #include "MovedBlocks.h"
  30
  31 #pragma warning(push)
  32 #pragma warning(disable: 4702) // unreachable code
  33 int CDiffData::abort_on_pool_failure (int /*retcode*/)
  34 {
  35         abort ();
  36         return -1;
  37 }
  38 #pragma warning(pop)
  39
  40 CDiffData::CDiffData(void)
  41         : m_bViewMovedBlocks(false)
  42         , m_bPatchRequired(false)
  43 {
  44         apr_initialize();
  45         svn_dso_initialize2();
  46
  47         m_bBlame = false;
  48
  49         m_sPatchOriginal = _T(": original");
  50         m_sPatchPatched = _T(": patched");
  51 }
  52
  53 CDiffData::~CDiffData(void)
  54 {
  55         apr_terminate();
  56 }
  57
  58 void CDiffData::SetMovedBlocks(bool bViewMovedBlocks/* = true*/)
  59 {
  60         m_bViewMovedBlocks = bViewMovedBlocks;
  61 }
  62
  63 int CDiffData::GetLineCount() const
  64 {
  65         int count = (int)m_arBaseFile.GetCount();
  66         if (count < m_arTheirFile.GetCount())
  67                 count = m_arTheirFile.GetCount();
  68         if (count < m_arYourFile.GetCount())
  69                 count = m_arYourFile.GetCount();
  70         return count;
  71 }
  72
  73 svn_diff_file_ignore_space_t CDiffData::GetIgnoreSpaceMode(DWORD dwIgnoreWS) const
  74 {
  75         switch (dwIgnoreWS)
  76         {
  77         case 0:
  78                 return svn_diff_file_ignore_space_none;
  79         case 1:
  80                 return svn_diff_file_ignore_space_all;
  81         case 2:
  82                 return svn_diff_file_ignore_space_change;
  83         default:
  84                 return svn_diff_file_ignore_space_none;
  85         }
  86 }
  87
  88 svn_diff_file_options_t * CDiffData::CreateDiffFileOptions(DWORD dwIgnoreWS, bool bIgnoreEOL, apr_pool_t * pool)
  89 {
  90         svn_diff_file_options_t * options = svn_diff_file_options_create(pool);
  91         options->ignore_eol_style = bIgnoreEOL;
  92         options->ignore_space = GetIgnoreSpaceMode(dwIgnoreWS);
  93         return options;
  94 }
  95
  96 bool CDiffData::HandleSvnError(svn_error_t * svnerr)
  97 {
  98         TRACE(_T("diff-error in CDiffData::Load()\n"));
  99         TRACE(_T("diff-error in CDiffData::Load()\n"));
 100         CStringA sMsg = CStringA(svnerr->message);
 101         while (svnerr->child)
 102         {
 103                 svnerr = svnerr->child;
 104                 sMsg += _T("\n");
 105                 sMsg += CStringA(svnerr->message);
 106         }
 107         CString readableMsg = CUnicodeUtils::GetUnicode(sMsg);
 108         m_sError.Format(IDS_ERR_DIFF_DIFF, (LPCTSTR)readableMsg);
 109         svn_error_clear(svnerr);
 110         return false;
 111 }
 112
 113 void CDiffData::TieMovedBlocks(int from, int to, apr_off_t length)
 114 {
 115         for(int i=0; i<length; i++, to++, from++)
 116         {
 117                 int fromIndex = m_YourBaseLeft.FindLineNumber(from);
 118                 int toIndex = m_YourBaseRight.FindLineNumber(to);
 119                 m_YourBaseLeft.SetMovedIndex(fromIndex, toIndex, true);
 120                 m_YourBaseRight.SetMovedIndex(toIndex, fromIndex, false);
 121
 122                 toIndex = m_YourBaseBoth.FindLineNumber(to);
 123                 if (toIndex < 0)
 124                         return;
 125                 while((toIndex < m_YourBaseBoth.GetCount())&&
 126                           ((m_YourBaseBoth.GetState(toIndex) != DIFFSTATE_ADDED)&&
 127                           (!m_YourBaseBoth.IsMoved(toIndex))||(m_YourBaseBoth.IsMovedFrom(toIndex))||
 128                           (m_YourBaseBoth.GetLineNumber(toIndex) != to)))
 129                 {
 130                         toIndex++;
 131                 }
 132
 133                 fromIndex = m_YourBaseBoth.FindLineNumber(from);
 134                 if (fromIndex < 0)
 135                         return;
 136                 while((fromIndex < m_YourBaseBoth.GetCount())&&
 137                           ((m_YourBaseBoth.GetState(fromIndex) != DIFFSTATE_REMOVED)&&
 138                           (!m_YourBaseBoth.IsMoved(fromIndex))||(!m_YourBaseBoth.IsMovedFrom(fromIndex))||
 139                           (m_YourBaseBoth.GetLineNumber(fromIndex) != from)))
 140                 {
 141                         fromIndex++;
 142                 }
 143                 if ((fromIndex < m_YourBaseBoth.GetCount())&&(toIndex < m_YourBaseBoth.GetCount()))
 144                 {
 145                         m_YourBaseBoth.SetMovedIndex(fromIndex, toIndex, true);
 146                         m_YourBaseBoth.SetMovedIndex(toIndex, fromIndex, false);
 147                 }
 148         }
 149 }
 150
 151 bool CDiffData::CompareWithIgnoreWS(CString s1, CString s2, DWORD dwIgnoreWS) const
 152 {
 153         if (dwIgnoreWS == 2)
 154         {
 155                 s1 = s1.TrimLeft(_T(" \t"));
 156                 s2 = s2.TrimLeft(_T(" \t"));
 157         }
 158         else
 159         {
 160                 s1 = s1.TrimRight(_T(" \t"));
 161                 s2 = s2.TrimRight(_T(" \t"));
 162         }
 163
 164         return s1 != s2;
 165 }
 166
 167 void CDiffData::StickAndSkip(svn_diff_t * &tempdiff, apr_off_t &original_length_sticked, apr_off_t &modified_length_sticked) const
 168 {
 169         if((m_bViewMovedBlocks)&&(tempdiff->type == svn_diff__type_diff_modified))
 170         {
 171                 svn_diff_t * nextdiff = tempdiff->next;
 172                 while((nextdiff)&&(nextdiff->type == svn_diff__type_diff_modified))
 173                 {
 174                         original_length_sticked += nextdiff->original_length;
 175                         modified_length_sticked += nextdiff->modified_length;
 176                         tempdiff = nextdiff;
 177                         nextdiff = tempdiff->next;
 178                 }
 179         }
 180 }
 181
 182 BOOL CDiffData::Load()
 183 {
 184         m_arBaseFile.RemoveAll();
 185         m_arYourFile.RemoveAll();
 186         m_arTheirFile.RemoveAll();
 187
 188         m_YourBaseBoth.Clear();
 189         m_YourBaseLeft.Clear();
 190         m_YourBaseRight.Clear();
 191
 192         m_TheirBaseBoth.Clear();
 193         m_TheirBaseLeft.Clear();
 194         m_TheirBaseRight.Clear();
 195
 196         m_Diff3.Clear();
 197
 198         CRegDWORD regIgnoreWS = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreWS"));
 199         CRegDWORD regIgnoreEOL = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreEOL"), TRUE);
 200         CRegDWORD regIgnoreCase = CRegDWORD(_T("Software\\TortoiseGitMerge\\CaseInsensitive"), FALSE);
 201         CRegDWORD regIgnoreComments = CRegDWORD(_T("Software\\TortoiseGitMerge\\IgnoreComments"), FALSE);
 202         DWORD dwIgnoreWS = regIgnoreWS;
 203         bool bIgnoreEOL = ((DWORD)regIgnoreEOL)!=0;
 204         BOOL bIgnoreCase = ((DWORD)regIgnoreCase)!=0;
 205         bool bIgnoreComments = ((DWORD)regIgnoreComments)!=0;
 206
 207         // The Subversion diff API only can ignore whitespaces and eol styles.
 208         // It also can only handle one-byte charsets.
 209         // To ignore case changes or to handle UTF-16 files, we have to
 210         // save the original file in UTF-8 and/or the letters changed to lowercase
 211         // so the Subversion diff can handle those.
 212         CString sConvertedBaseFilename = m_baseFile.GetFilename();
 213         CString sConvertedYourFilename = m_yourFile.GetFilename();
 214         CString sConvertedTheirFilename = m_theirFile.GetFilename();
 215
 216         m_baseFile.StoreFileAttributes();
 217         m_theirFile.StoreFileAttributes();
 218         m_yourFile.StoreFileAttributes();
 219         //m_mergedFile.StoreFileAttributes();
 220
 221         bool bBaseNeedConvert  = false;
 222         bool bTheirNeedConvert = false;
 223         bool bYourNeedConvert  = false;
 224         bool bBaseIsUtf8  = false;
 225         bool bTheirIsUtf8 = false;
 226         bool bYourIsUtf8  = false;
 227
 228         if (IsBaseFileInUse())
 229         {
 230                 if (!m_arBaseFile.Load(m_baseFile.GetFilename()))
 231                 {
 232                         m_sError = m_arBaseFile.GetErrorString();
 233                         return FALSE;
 234                 }
 235                 bBaseNeedConvert = bIgnoreCase || bIgnoreComments || (m_arBaseFile.NeedsConversion()) || !m_rx._Empty();
 236                 bBaseIsUtf8 = (m_arBaseFile.GetUnicodeType()!=CFileTextLines::ASCII) || bBaseNeedConvert;
 237         }
 238
 239         if (IsTheirFileInUse())
 240         {
 241                 // m_arBaseFile.GetCount() is passed as a hint for the number of lines in this file
 242                 // It's a fair guess that the files will be roughly the same size
 243                 if (!m_arTheirFile.Load(m_theirFile.GetFilename(), m_arBaseFile.GetCount()))
 244                 {
 245                         m_sError = m_arTheirFile.GetErrorString();
 246                         return FALSE;
 247                 }
 248                 bTheirNeedConvert = bIgnoreCase || bIgnoreComments || (m_arTheirFile.NeedsConversion()) || !m_rx._Empty();
 249                 bTheirIsUtf8 = (m_arTheirFile.GetUnicodeType()!=CFileTextLines::ASCII) || bTheirNeedConvert;
 250         }
 251
 252         if (IsYourFileInUse())
 253         {
 254                 // m_arBaseFile.GetCount() is passed as a hint for the number of lines in this file
 255                 // It's a fair guess that the files will be roughly the same size
 256                 if (!m_arYourFile.Load(m_yourFile.GetFilename(), m_arBaseFile.GetCount()))
 257                 {
 258                         m_sError = m_arYourFile.GetErrorString();
 259                         return FALSE;
 260                 }
 261                 bYourNeedConvert = bIgnoreCase || bIgnoreComments || (m_arYourFile.NeedsConversion()) || !m_rx._Empty();
 262                 bYourIsUtf8 = (m_arYourFile.GetUnicodeType()!=CFileTextLines::ASCII) || bYourNeedConvert;
 263         }
 264
 265         // in case at least one of the files got converted or is UTF8
 266         // we have to convert all non UTF8 (ASCII) files
 267         // otherwise one file might be in ANSI and the other in UTF8 and we'll end up
 268         // with lines marked as different throughout the files even though the lines
 269         // would show no change at all in the viewer.
 270
 271         // convert all files we need to
 272         bool bIsUtf8 = bBaseIsUtf8 || bTheirIsUtf8 || bYourIsUtf8; // any file end as UTF8
 273         bBaseNeedConvert |= (IsBaseFileInUse() && !bBaseIsUtf8 && bIsUtf8);
 274         if (bBaseNeedConvert)
 275         {
 276                 sConvertedBaseFilename = CTempFiles::Instance().GetTempFilePathString();
 277                 m_baseFile.SetConvertedFileName(sConvertedBaseFilename);
 278                 m_arBaseFile.Save(sConvertedBaseFilename, true, true, 0, bIgnoreCase, m_bBlame
 279                                                 , bIgnoreComments, m_CommentLineStart, m_CommentBlockStart, m_CommentBlockEnd
 280                                                 , m_rx, m_replacement);
 281         }
 282         bYourNeedConvert |= (IsYourFileInUse() && !bYourIsUtf8 && bIsUtf8);
 283         if (bYourNeedConvert)
 284         {
 285                 sConvertedYourFilename = CTempFiles::Instance().GetTempFilePathString();
 286                 m_yourFile.SetConvertedFileName(sConvertedYourFilename);
 287                 m_arYourFile.Save(sConvertedYourFilename, true, true, 0, bIgnoreCase, m_bBlame
 288                                                 , bIgnoreComments, m_CommentLineStart, m_CommentBlockStart, m_CommentBlockEnd
 289                                                 , m_rx, m_replacement);
 290         }
 291         bTheirNeedConvert |= (IsTheirFileInUse() && !bTheirIsUtf8 && bIsUtf8);
 292         if (bTheirNeedConvert)
 293         {
 294                 sConvertedTheirFilename = CTempFiles::Instance().GetTempFilePathString();
 295                 m_theirFile.SetConvertedFileName(sConvertedTheirFilename);
 296                 m_arTheirFile.Save(sConvertedTheirFilename, true, true, 0, bIgnoreCase, m_bBlame
 297                                                 , bIgnoreComments, m_CommentLineStart, m_CommentBlockStart, m_CommentBlockEnd
 298                                                 , m_rx, m_replacement);
 299         }
 300
 301         // Calculate the number of lines in the largest of the three files
 302         int lengthHint = GetLineCount();
 303
 304         try
 305         {
 306                 m_YourBaseBoth.Reserve(lengthHint);
 307                 m_YourBaseLeft.Reserve(lengthHint);
 308                 m_YourBaseRight.Reserve(lengthHint);
 309
 310                 m_TheirBaseBoth.Reserve(lengthHint);
 311                 m_TheirBaseLeft.Reserve(lengthHint);
 312                 m_TheirBaseRight.Reserve(lengthHint);
 313         }
 314         catch (CMemoryException* e)
 315         {
 316                 e->GetErrorMessage(m_sError.GetBuffer(255), 255);
 317                 m_sError.ReleaseBuffer();
 318                 e->Delete();
 319                 return FALSE;
 320         }
 321
 322         apr_pool_t * pool = NULL;
 323         apr_pool_create_ex (&pool, NULL, abort_on_pool_failure, NULL);
 324
 325         // Is this a two-way diff?
 326         if (IsBaseFileInUse() && IsYourFileInUse() && !IsTheirFileInUse())
 327         {
 328                 if (!DoTwoWayDiff(sConvertedBaseFilename, sConvertedYourFilename, dwIgnoreWS, bIgnoreEOL, pool))
 329                 {
 330                         apr_pool_destroy (pool);                    // free the allocated memory
 331                         return FALSE;
 332                 }
 333         }
 334
 335         if (IsBaseFileInUse() && IsTheirFileInUse() && !IsYourFileInUse())
 336         {
 337                 ASSERT(FALSE);
 338         }
 339
 340         // Is this a three-way diff?
 341         if (IsBaseFileInUse() && IsTheirFileInUse() && IsYourFileInUse())
 342         {
 343                 m_Diff3.Reserve(lengthHint);
 344
 345                 if (!DoThreeWayDiff(sConvertedBaseFilename, sConvertedYourFilename, sConvertedTheirFilename, dwIgnoreWS, bIgnoreEOL, !!bIgnoreCase, pool))
 346                 {
 347                         apr_pool_destroy (pool);                    // free the allocated memory
 348                         return FALSE;
 349                 }
 350         }
 351
 352         // free the allocated memory
 353         apr_pool_destroy (pool);
 354
 355         m_arBaseFile.RemoveAll();
 356         m_arYourFile.RemoveAll();
 357         m_arTheirFile.RemoveAll();
 358
 359         return TRUE;
 360 }
 361
 362 bool
 363 CDiffData::DoTwoWayDiff(const CString& sBaseFilename, const CString& sYourFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, apr_pool_t * pool)
 364 {
 365         svn_diff_file_options_t * options = CreateDiffFileOptions(dwIgnoreWS, bIgnoreEOL, pool);
 366         // convert CString filenames (UTF-16 or ANSI) to UTF-8
 367         CStringA sBaseFilenameUtf8 = CUnicodeUtils::GetUTF8(sBaseFilename);
 368         CStringA sYourFilenameUtf8 = CUnicodeUtils::GetUTF8(sYourFilename);
 369
 370         svn_diff_t * diffYourBase = NULL;
 371         svn_error_t * svnerr = svn_diff_file_diff_2(&diffYourBase, sBaseFilenameUtf8, sYourFilenameUtf8, options, pool);
 372
 373         if (svnerr)
 374                 return HandleSvnError(svnerr);
 375
 376         tsvn_svn_diff_t_extension * movedBlocks = NULL;
 377         if(m_bViewMovedBlocks)
 378                 movedBlocks = MovedBlocksDetect(diffYourBase, dwIgnoreWS, pool); // Side effect is that diffs are now splitted
 379
 380         svn_diff_t * tempdiff = diffYourBase;
 381         LONG baseline = 0;
 382         LONG yourline = 0;
 383         while (tempdiff)
 384         {
 385                 svn_diff__type_e diffType = tempdiff->type;
 386                 // Side effect described above overcoming - sticking together
 387                 apr_off_t original_length_sticked = tempdiff->original_length;
 388                 apr_off_t modified_length_sticked = tempdiff->modified_length;
 389                 StickAndSkip(tempdiff, original_length_sticked, modified_length_sticked);
 390
 391                 for (int i=0; i<original_length_sticked; i++)
 392                 {
 393                         if (baseline >= m_arBaseFile.GetCount())
 394                         {
 395                                 m_sError.LoadString(IDS_ERR_DIFF_NEWLINES);
 396                                 return false;
 397                         }
 398                         const CString& sCurrentBaseLine = m_arBaseFile.GetAt(baseline);
 399                         EOL endingBase = m_arBaseFile.GetLineEnding(baseline);
 400                         if (diffType == svn_diff__type_common)
 401                         {
 402                                 if (yourline >= m_arYourFile.GetCount())
 403                                 {
 404                                         m_sError.LoadString(IDS_ERR_DIFF_NEWLINES);
 405                                         return false;
 406                                 }
 407                                 const CString& sCurrentYourLine = m_arYourFile.GetAt(yourline);
 408                                 EOL endingYours = m_arYourFile.GetLineEnding(yourline);
 409                                 if (sCurrentBaseLine != sCurrentYourLine)
 410                                 {
 411                                         bool changedWS = false;
 412                                         if (dwIgnoreWS == 2 || dwIgnoreWS == 3)
 413                                                 changedWS = CompareWithIgnoreWS(sCurrentBaseLine, sCurrentYourLine, dwIgnoreWS);
 414                                         if (changedWS || dwIgnoreWS == 0)
 415                                         {
 416                                                 // one-pane view: two lines, one 'removed' and one 'added'
 417                                                 m_YourBaseBoth.AddData(sCurrentBaseLine, DIFFSTATE_REMOVEDWHITESPACE, yourline, endingBase, HIDESTATE_SHOWN, -1);
 418                                                 m_YourBaseBoth.AddData(sCurrentYourLine, DIFFSTATE_ADDEDWHITESPACE, yourline, endingYours, HIDESTATE_SHOWN, -1);
 419                                         }
 420                                         else
 421                                         {
 422                                                 m_YourBaseBoth.AddData(sCurrentYourLine, DIFFSTATE_NORMAL, yourline, endingBase, HIDESTATE_HIDDEN, -1);
 423                                         }
 424                                 }
 425                                 else
 426                                 {
 427                                         m_YourBaseBoth.AddData(sCurrentYourLine, DIFFSTATE_NORMAL, yourline, endingBase, HIDESTATE_HIDDEN, -1);
 428                                 }
 429                                 yourline++;     //in both files
 430                         }
 431                         else
 432                         { // small trick - we need here a baseline, but we fix it back to yourline at the end of routine
 433                                 m_YourBaseBoth.AddData(sCurrentBaseLine, DIFFSTATE_REMOVED, -1, endingBase, HIDESTATE_SHOWN, -1);
 434                         }
 435                         baseline++;
 436                 }
 437                 if (diffType == svn_diff__type_diff_modified)
 438                 {
 439                         for (int i=0; i<modified_length_sticked; i++)
 440                         {
 441                                 if (m_arYourFile.GetCount() > yourline)
 442                                 {
 443                                         m_YourBaseBoth.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_ADDED, yourline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN, -1);
 444                                 }
 445                                 yourline++;
 446                         }
 447                 }
 448                 tempdiff = tempdiff->next;
 449         }
 450
 451         HideUnchangedSections(&m_YourBaseBoth, NULL, NULL);
 452
 453         tempdiff = diffYourBase;
 454         baseline = 0;
 455         yourline = 0;
 456         while (tempdiff)
 457         {
 458                 if (tempdiff->type == svn_diff__type_common)
 459                 {
 460                         for (int i=0; i<tempdiff->original_length; i++)
 461                         {
 462                                 const CString& sCurrentYourLine = m_arYourFile.GetAt(yourline);
 463                                 EOL endingYours = m_arYourFile.GetLineEnding(yourline);
 464                                 const CString& sCurrentBaseLine = m_arBaseFile.GetAt(baseline);
 465                                 EOL endingBase = m_arBaseFile.GetLineEnding(baseline);
 466                                 if (sCurrentBaseLine != sCurrentYourLine)
 467                                 {
 468                                         bool changedWS = false;
 469                                         if (dwIgnoreWS == 2 || dwIgnoreWS == 3)
 470                                                 changedWS = CompareWithIgnoreWS(sCurrentBaseLine, sCurrentYourLine, dwIgnoreWS);
 471                                         if (changedWS || dwIgnoreWS == 0)
 472                                         {
 473                                                 m_YourBaseLeft.AddData(sCurrentBaseLine, DIFFSTATE_WHITESPACE, baseline, endingBase, HIDESTATE_SHOWN, -1);
 474                                                 m_YourBaseRight.AddData(sCurrentYourLine, DIFFSTATE_WHITESPACE, yourline, endingYours, HIDESTATE_SHOWN, -1);
 475                                         }
 476                                         else
 477                                         {
 478                                                 m_YourBaseLeft.AddData(sCurrentBaseLine, DIFFSTATE_NORMAL, baseline, endingBase, HIDESTATE_HIDDEN, -1);
 479                                                 m_YourBaseRight.AddData(sCurrentYourLine, DIFFSTATE_NORMAL, yourline, endingYours, HIDESTATE_HIDDEN, -1);
 480                                         }
 481                                 }
 482                                 else
 483                                 {
 484                                         m_YourBaseLeft.AddData(sCurrentBaseLine, DIFFSTATE_NORMAL, baseline, endingBase, HIDESTATE_HIDDEN, -1);
 485                                         m_YourBaseRight.AddData(sCurrentYourLine, DIFFSTATE_NORMAL, yourline, endingYours, HIDESTATE_HIDDEN, -1);
 486                                 }
 487                                 baseline++;
 488                                 yourline++;
 489                         }
 490                 }
 491                 if (tempdiff->type == svn_diff__type_diff_modified)
 492                 {
 493                         // now we trying to stick together parts, that were splitted by MovedBlocks
 494                         apr_off_t original_length_sticked = tempdiff->original_length;
 495                         apr_off_t modified_length_sticked = tempdiff->modified_length;
 496                         StickAndSkip(tempdiff, original_length_sticked, modified_length_sticked);
 497
 498                         apr_off_t original_length = original_length_sticked;
 499                         for (int i=0; i<modified_length_sticked; i++)
 500                         {
 501                                 if (m_arYourFile.GetCount() > yourline)
 502                                 {
 503                                         EOL endingYours = m_arYourFile.GetLineEnding(yourline);
 504                                         m_YourBaseRight.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_ADDED, yourline, endingYours, HIDESTATE_SHOWN, -1);
 505                                         if (original_length-- <= 0)
 506                                         {
 507                                                 m_YourBaseLeft.AddEmpty();
 508                                         }
 509                                         else
 510                                         {
 511                                                 EOL endingBase = m_arBaseFile.GetLineEnding(baseline);
 512                                                 m_YourBaseLeft.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_REMOVED, baseline, endingBase, HIDESTATE_SHOWN, -1);
 513                                                 baseline++;
 514                                         }
 515                                         yourline++;
 516                                 }
 517                         }
 518                         apr_off_t modified_length = modified_length_sticked;
 519                         for (int i=0; i<original_length_sticked; i++)
 520                         {
 521                                 if ((modified_length-- <= 0)&&(m_arBaseFile.GetCount() > baseline))
 522                                 {
 523                                         EOL endingBase = m_arBaseFile.GetLineEnding(baseline);
 524                                         m_YourBaseLeft.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_REMOVED, baseline, endingBase, HIDESTATE_SHOWN, -1);
 525                                         m_YourBaseRight.AddEmpty();
 526                                         baseline++;
 527                                 }
 528                         }
 529                 }
 530                 tempdiff = tempdiff->next;
 531         }
 532         // add last (empty) lines if needed - diff don't report those
 533         if (m_arBaseFile.GetCount() > baseline)
 534         {
 535                 if (m_arYourFile.GetCount() > yourline)
 536                 {
 537                         // last line is missing in both files add them to end and mark as no diff
 538                         m_YourBaseLeft.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_NORMAL, baseline, m_arBaseFile.GetLineEnding(baseline), HIDESTATE_SHOWN, -1);
 539                         m_YourBaseRight.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_NORMAL, yourline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN, -1);
 540                         yourline++;
 541                         baseline++;
 542                 }
 543                 else
 544                 {
 545                         viewdata oViewData(m_arBaseFile.GetAt(baseline), DIFFSTATE_REMOVED, baseline, m_arBaseFile.GetLineEnding(baseline), HIDESTATE_SHOWN);
 546                         baseline++;
 547
 548                         // find first EMPTY line in last blok
 549                         int nPos = m_YourBaseLeft.GetCount();
 550                         while (--nPos>=0 && m_YourBaseLeft.GetState(nPos)==DIFFSTATE_EMPTY) ;
 551                         if (++nPos<m_YourBaseLeft.GetCount())
 552                         {
 553                                 m_YourBaseLeft.SetData(nPos, oViewData);
 554                         }
 555                         else
 556                         {
 557                                 m_YourBaseLeft.AddData(oViewData);
 558                                 m_YourBaseRight.AddEmpty();
 559                         }
 560                 }
 561         }
 562         else if (m_arYourFile.GetCount() > yourline)
 563         {
 564                 viewdata oViewData(m_arYourFile.GetAt(yourline), DIFFSTATE_ADDED, yourline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN);
 565                 yourline++;
 566
 567                 // try to move last line higher
 568                 int nPos = m_YourBaseRight.GetCount();
 569                 while (--nPos>=0 && m_YourBaseRight.GetState(nPos)==DIFFSTATE_EMPTY) ;
 570                 if (++nPos<m_YourBaseRight.GetCount())
 571                 {
 572                         m_YourBaseRight.SetData(nPos, oViewData);
 573                 }
 574                 else
 575                 {
 576                         m_YourBaseLeft.AddEmpty();
 577                         m_YourBaseRight.AddData(oViewData);
 578                 }
 579         }
 580
 581
 582         // Fixing results for conforming moved blocks
 583
 584         while(movedBlocks)
 585         {
 586                 tempdiff = movedBlocks->base;
 587                 if(movedBlocks->moved_to != -1)
 588                 {
 589                         // set states in a block original:length -> moved_to:length
 590                         TieMovedBlocks((int)tempdiff->original_start, movedBlocks->moved_to, tempdiff->original_length);
 591                 }
 592                 if(movedBlocks->moved_from != -1)
 593                 {
 594                         // set states in a block modified:length -> moved_from:length
 595                         TieMovedBlocks(movedBlocks->moved_from, (int)tempdiff->modified_start, tempdiff->modified_length);
 596                 }
 597                 movedBlocks = movedBlocks->next;
 598         }
 599
 600         // replace baseline with the yourline in m_YourBaseBoth
 601 /*      yourline = 0;
 602         for(int i=0; i<m_YourBaseBoth.GetCount(); i++)
 603         {
 604                 DiffStates state = m_YourBaseBoth.GetState(i);
 605                 if((state == DIFFSTATE_REMOVED)||(state == DIFFSTATE_MOVED_FROM))
 606                 {
 607                         m_YourBaseBoth.SetLineNumber(i, -1);
 608                 }
 609                 else
 610                 {
 611                         yourline++;
 612                 }
 613         }//*/
 614
 615         TRACE(_T("done with 2-way diff\n"));
 616
 617         HideUnchangedSections(&m_YourBaseLeft, &m_YourBaseRight, NULL);
 618
 619         return true;
 620 }
 621
 622 bool
 623 CDiffData::DoThreeWayDiff(const CString& sBaseFilename, const CString& sYourFilename, const CString& sTheirFilename, DWORD dwIgnoreWS, bool bIgnoreEOL, bool bIgnoreCase, apr_pool_t * pool)
 624 {
 625         // the following three arrays are used to check for conflicts even in case the
 626         // user has ignored spaces/eols.
 627         CStdDWORDArray              m_arDiff3LinesBase;
 628         CStdDWORDArray              m_arDiff3LinesYour;
 629         CStdDWORDArray              m_arDiff3LinesTheir;
 630 #define AddLines(baseline, yourline, theirline) m_arDiff3LinesBase.Add(baseline), m_arDiff3LinesYour.Add(yourline), m_arDiff3LinesTheir.Add(theirline)
 631         int lengthHint = GetLineCount();
 632
 633         m_arDiff3LinesBase.Reserve(lengthHint);
 634         m_arDiff3LinesYour.Reserve(lengthHint);
 635         m_arDiff3LinesTheir.Reserve(lengthHint);
 636
 637         CRegDWORD contextLines = CRegDWORD(_T("Software\\TortoiseGitMerge\\ContextLines"), 3);
 638         svn_diff_file_options_t * options = CreateDiffFileOptions(dwIgnoreWS, bIgnoreEOL, pool);
 639
 640         // convert CString filenames (UTF-16 or ANSI) to UTF-8
 641         CStringA sBaseFilenameUtf8  = CUnicodeUtils::GetUTF8(sBaseFilename);
 642         CStringA sYourFilenameUtf8  = CUnicodeUtils::GetUTF8(sYourFilename);
 643         CStringA sTheirFilenameUtf8 = CUnicodeUtils::GetUTF8(sTheirFilename);
 644
 645         svn_diff_t * diffTheirYourBase = NULL;
 646         svn_error_t * svnerr = svn_diff_file_diff3_2(&diffTheirYourBase, sBaseFilenameUtf8, sTheirFilenameUtf8, sYourFilenameUtf8, options, pool);
 647         if (svnerr)
 648                 return HandleSvnError(svnerr);
 649
 650         svn_diff_t * tempdiff = diffTheirYourBase;
 651         LONG baseline = 0;
 652         LONG yourline = 0;
 653         LONG theirline = 0;
 654         LONG resline = 0;
 655         // common viewdata
 656         const viewdata emptyConflictEmpty(_T(""), DIFFSTATE_CONFLICTEMPTY, DIFF_EMPTYLINENUMBER, EOL_NOENDING, HIDESTATE_SHOWN);
 657         const viewdata emptyIdenticalRemoved(_T(""), DIFFSTATE_IDENTICALREMOVED, DIFF_EMPTYLINENUMBER, EOL_NOENDING, HIDESTATE_SHOWN);
 658         while (tempdiff)
 659         {
 660                 if (tempdiff->type == svn_diff__type_common)
 661                 {
 662                         ASSERT((tempdiff->latest_length == tempdiff->modified_length) && (tempdiff->modified_length == tempdiff->original_length));
 663                         for (int i=0; i<tempdiff->original_length; i++)
 664                         {
 665                                 if ((m_arYourFile.GetCount() > yourline)&&(m_arTheirFile.GetCount() > theirline))
 666                                 {
 667                                         AddLines(baseline, yourline, theirline);
 668
 669                                         m_Diff3.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_NORMAL, resline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_HIDDEN, -1);
 670                                         m_YourBaseBoth.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_NORMAL, yourline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_HIDDEN, -1);
 671                                         m_TheirBaseBoth.AddData(m_arTheirFile.GetAt(theirline), DIFFSTATE_NORMAL, theirline, m_arTheirFile.GetLineEnding(theirline), HIDESTATE_HIDDEN, -1);
 672
 673                                         baseline++;
 674                                         yourline++;
 675                                         theirline++;
 676                                         resline++;
 677                                 }
 678                         }
 679                 }
 680                 else if (tempdiff->type == svn_diff__type_diff_common)
 681                 {
 682                         ASSERT(tempdiff->latest_length == tempdiff->modified_length);
 683                         //both theirs and yours have lines replaced
 684                         for (int i=0; i<tempdiff->original_length; i++)
 685                         {
 686                                 if (m_arBaseFile.GetCount() > baseline)
 687                                 {
 688                                         AddLines(baseline, yourline, theirline);
 689
 690                                         m_Diff3.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_IDENTICALREMOVED, DIFF_EMPTYLINENUMBER, m_arBaseFile.GetLineEnding(baseline), HIDESTATE_SHOWN, -1);
 691                                         m_YourBaseBoth.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_IDENTICALREMOVED, DIFF_EMPTYLINENUMBER, EOL_NOENDING, HIDESTATE_SHOWN, -1);
 692                                         m_TheirBaseBoth.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_IDENTICALREMOVED, DIFF_EMPTYLINENUMBER, EOL_NOENDING, HIDESTATE_SHOWN, -1);
 693
 694                                         baseline++;
 695                                 }
 696                         }
 697                         for (int i=0; i<tempdiff->modified_length; i++)
 698                         {
 699                                 if ((m_arYourFile.GetCount() > yourline)&&(m_arTheirFile.GetCount() > theirline))
 700                                 {
 701                                         AddLines(baseline, yourline, theirline);
 702
 703                                         m_Diff3.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_IDENTICALADDED, resline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN, -1);
 704                                         m_YourBaseBoth.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_IDENTICALADDED, yourline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN, -1);
 705                                         m_TheirBaseBoth.AddData(m_arTheirFile.GetAt(theirline), DIFFSTATE_IDENTICALADDED, resline, m_arTheirFile.GetLineEnding(theirline), HIDESTATE_SHOWN, -1);
 706
 707                                         yourline++;
 708                                         theirline++;
 709                                         resline++;
 710                                 }
 711                         }
 712                 }
 713                 else if (tempdiff->type == svn_diff__type_conflict)
 714                 {
 715                         apr_off_t length = max(tempdiff->original_length, tempdiff->modified_length);
 716                         length = max(tempdiff->latest_length, length);
 717                         apr_off_t original = tempdiff->original_length;
 718                         apr_off_t modified = tempdiff->modified_length;
 719                         apr_off_t latest = tempdiff->latest_length;
 720
 721                         apr_off_t originalresolved = 0;
 722                         apr_off_t modifiedresolved = 0;
 723                         apr_off_t latestresolved = 0;
 724
 725                         LONG base = baseline;
 726                         LONG your = yourline;
 727                         LONG their = theirline;
 728                         if (tempdiff->resolved_diff)
 729                         {
 730                                 originalresolved = tempdiff->resolved_diff->original_length;
 731                                 modifiedresolved = tempdiff->resolved_diff->modified_length;
 732                                 latestresolved = tempdiff->resolved_diff->latest_length;
 733                         }
 734                         for (int i=0; i<length; i++)
 735                         {
 736                                 EOL endingBase = m_arBaseFile.GetCount() > baseline ? m_arBaseFile.GetLineEnding(baseline) : EOL_AUTOLINE;
 737                                 if (original)
 738                                 {
 739                                         if (m_arBaseFile.GetCount() > baseline)
 740                                         {
 741                                                 AddLines(baseline, yourline, theirline);
 742
 743                                                 m_Diff3.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_IDENTICALREMOVED, DIFF_EMPTYLINENUMBER, endingBase , HIDESTATE_SHOWN, -1);
 744                                                 m_YourBaseBoth.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_IDENTICALREMOVED, DIFF_EMPTYLINENUMBER, endingBase , HIDESTATE_SHOWN, -1);
 745                                                 m_TheirBaseBoth.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_IDENTICALREMOVED, DIFF_EMPTYLINENUMBER, endingBase , HIDESTATE_SHOWN, -1);
 746                                         }
 747                                 }
 748                                 else if ((originalresolved)||((modifiedresolved)&&(latestresolved)))
 749                                 {
 750                                         AddLines(baseline, yourline, theirline);
 751
 752                                         m_Diff3.AddData(emptyIdenticalRemoved);
 753                                         if ((latestresolved)&&(modifiedresolved))
 754                                         {
 755                                                 m_YourBaseBoth.AddData(emptyIdenticalRemoved);
 756                                                 m_TheirBaseBoth.AddData(emptyIdenticalRemoved);
 757                                         }
 758                                 }
 759                                 if (original)
 760                                 {
 761                                         original--;
 762                                         baseline++;
 763                                 }
 764                                 if (originalresolved)
 765                                         originalresolved--;
 766
 767                                 if (modified)
 768                                 {
 769                                         modified--;
 770                                         theirline++;
 771                                 }
 772                                 if (modifiedresolved)
 773                                         modifiedresolved--;
 774                                 if (latest)
 775                                 {
 776                                         latest--;
 777                                         yourline++;
 778                                 }
 779                                 if (latestresolved)
 780                                         latestresolved--;
 781                         }
 782                         original = tempdiff->original_length;
 783                         modified = tempdiff->modified_length;
 784                         latest = tempdiff->latest_length;
 785                         baseline = base;
 786                         yourline = your;
 787                         theirline = their;
 788                         if (tempdiff->resolved_diff)
 789                         {
 790                                 originalresolved = tempdiff->resolved_diff->original_length;
 791                                 modifiedresolved = tempdiff->resolved_diff->modified_length;
 792                                 latestresolved = tempdiff->resolved_diff->latest_length;
 793                         }
 794                         for (int i=0; i<length; i++)
 795                         {
 796                                 if ((latest)||(modified))
 797                                 {
 798                                         AddLines(baseline, yourline, theirline);
 799
 800                                         m_Diff3.AddData(_T(""), DIFFSTATE_CONFLICTED, resline, EOL_NOENDING, HIDESTATE_SHOWN, -1);
 801
 802                                         resline++;
 803                                 }
 804
 805                                 if (latest)
 806                                 {
 807                                         if (m_arYourFile.GetCount() > yourline)
 808                                         {
 809                                                 m_YourBaseBoth.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_CONFLICTADDED, yourline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN, -1);
 810                                         }
 811                                 }
 812                                 else if ((latestresolved)||(modified)||(modifiedresolved))
 813                                 {
 814                                         m_YourBaseBoth.AddData(emptyConflictEmpty);
 815                                 }
 816                                 if (modified)
 817                                 {
 818                                         if (m_arTheirFile.GetCount() > theirline)
 819                                         {
 820                                                 m_TheirBaseBoth.AddData(m_arTheirFile.GetAt(theirline), DIFFSTATE_CONFLICTADDED, theirline, m_arTheirFile.GetLineEnding(theirline), HIDESTATE_SHOWN, -1);
 821                                         }
 822                                 }
 823                                 else if ((modifiedresolved)||(latest)||(latestresolved))
 824                                 {
 825                                         m_TheirBaseBoth.AddData(emptyConflictEmpty);
 826                                 }
 827                                 if (original)
 828                                 {
 829                                         original--;
 830                                         baseline++;
 831                                 }
 832                                 if (originalresolved)
 833                                         originalresolved--;
 834                                 if (modified)
 835                                 {
 836                                         modified--;
 837                                         theirline++;
 838                                 }
 839                                 if (modifiedresolved)
 840                                         modifiedresolved--;
 841                                 if (latest)
 842                                 {
 843                                         latest--;
 844                                         yourline++;
 845                                 }
 846                                 if (latestresolved)
 847                                         latestresolved--;
 848                         }
 849                 }
 850                 else if (tempdiff->type == svn_diff__type_diff_modified)
 851                 {
 852                         //deleted!
 853                         for (int i=0; i<tempdiff->original_length; i++)
 854                         {
 855                                 if ((m_arBaseFile.GetCount() > baseline)&&(m_arYourFile.GetCount() > yourline))
 856                                 {
 857                                         AddLines(baseline, yourline, theirline);
 858
 859                                         m_Diff3.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_THEIRSREMOVED, DIFF_EMPTYLINENUMBER, m_arBaseFile.GetLineEnding(baseline), HIDESTATE_SHOWN, -1);
 860                                         m_YourBaseBoth.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_NORMAL, yourline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN, -1);
 861                                         m_TheirBaseBoth.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_THEIRSREMOVED, DIFF_EMPTYLINENUMBER, EOL_NOENDING, HIDESTATE_SHOWN, -1);
 862
 863                                         baseline++;
 864                                         yourline++;
 865                                 }
 866                         }
 867                         //added
 868                         for (int i=0; i<tempdiff->modified_length; i++)
 869                         {
 870                                 if (m_arTheirFile.GetCount() > theirline)
 871                                 {
 872                                         AddLines(baseline, yourline, theirline);
 873
 874                                         m_Diff3.AddData(m_arTheirFile.GetAt(theirline), DIFFSTATE_THEIRSADDED, resline, m_arTheirFile.GetLineEnding(theirline), HIDESTATE_SHOWN, -1);
 875                                         m_YourBaseBoth.AddEmpty();
 876                                         m_TheirBaseBoth.AddData(m_arTheirFile.GetAt(theirline), DIFFSTATE_THEIRSADDED, theirline, m_arTheirFile.GetLineEnding(theirline), HIDESTATE_SHOWN, -1);
 877
 878                                         theirline++;
 879                                         resline++;
 880                                 }
 881                         }
 882                 }
 883                 else if (tempdiff->type == svn_diff__type_diff_latest)
 884                 {
 885                         //YOURS differs from base
 886
 887                         for (int i=0; i<tempdiff->original_length; i++)
 888                         {
 889                                 if ((m_arBaseFile.GetCount() > baseline)&&(m_arTheirFile.GetCount() > theirline))
 890                                 {
 891                                         AddLines(baseline, yourline, theirline);
 892
 893                                         m_Diff3.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_YOURSREMOVED, DIFF_EMPTYLINENUMBER, m_arBaseFile.GetLineEnding(baseline), HIDESTATE_SHOWN, -1);
 894                                         m_YourBaseBoth.AddData(m_arBaseFile.GetAt(baseline), DIFFSTATE_YOURSREMOVED, DIFF_EMPTYLINENUMBER, m_arBaseFile.GetLineEnding(baseline), HIDESTATE_SHOWN, -1);
 895                                         m_TheirBaseBoth.AddData(m_arTheirFile.GetAt(theirline), DIFFSTATE_NORMAL, theirline, m_arTheirFile.GetLineEnding(theirline), HIDESTATE_HIDDEN, -1);
 896
 897                                         baseline++;
 898                                         theirline++;
 899                                 }
 900                         }
 901                         for (int i=0; i<tempdiff->latest_length; i++)
 902                         {
 903                                 if (m_arYourFile.GetCount() > yourline)
 904                                 {
 905                                         AddLines(baseline, yourline, theirline);
 906
 907                                         m_Diff3.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_YOURSADDED, resline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN, -1);
 908                                         m_YourBaseBoth.AddData(m_arYourFile.GetAt(yourline), DIFFSTATE_IDENTICALADDED, yourline, m_arYourFile.GetLineEnding(yourline), HIDESTATE_SHOWN, -1);
 909                                         m_TheirBaseBoth.AddEmpty();
 910
 911                                         yourline++;
 912                                         resline++;
 913                                 }
 914                         }
 915                 }
 916                 else
 917                 {
 918                         TRACE(_T("something bad happened during diff!\n"));
 919                 }
 920                 tempdiff = tempdiff->next;
 921
 922         } // while (tempdiff)
 923
 924         if ((options->ignore_space != svn_diff_file_ignore_space_none)||(bIgnoreCase)||(bIgnoreEOL))
 925         {
 926                 // If whitespaces are ignored, a conflict could have been missed
 927                 // We now go through all lines again and check if they're identical.
 928                 // If they're not, then that means it is a conflict, and we
 929                 // mark the conflict with the proper colors.
 930                 for (long i=0; i<m_Diff3.GetCount(); ++i)
 931                 {
 932                         DiffStates state1 = m_YourBaseBoth.GetState(i);
 933                         DiffStates state2 = m_TheirBaseBoth.GetState(i);
 934
 935                         if (((state1 == DIFFSTATE_IDENTICALADDED)||(state1 == DIFFSTATE_NORMAL))&&
 936                                 ((state2 == DIFFSTATE_IDENTICALADDED)||(state2 == DIFFSTATE_NORMAL)))
 937                         {
 938                                 LONG lineyour = m_arDiff3LinesYour.GetAt(i);
 939                                 LONG linetheir = m_arDiff3LinesTheir.GetAt(i);
 940                                 LONG linebase = m_arDiff3LinesBase.GetAt(i);
 941                                 if ((lineyour < m_arYourFile.GetCount()) &&
 942                                         (linetheir < m_arTheirFile.GetCount()) &&
 943                                         (linebase < m_arBaseFile.GetCount()))
 944                                 {
 945                                         if (((m_arYourFile.GetLineEnding(lineyour)!=m_arBaseFile.GetLineEnding(linebase))&&
 946                                                 (m_arTheirFile.GetLineEnding(linetheir)!=m_arBaseFile.GetLineEnding(linebase))&&
 947                                                 (m_arYourFile.GetLineEnding(lineyour)!=m_arTheirFile.GetLineEnding(linetheir))) ||
 948                                                 ((m_arYourFile.GetAt(lineyour).Compare(m_arBaseFile.GetAt(linebase))!=0)&&
 949                                                 (m_arTheirFile.GetAt(linetheir).Compare(m_arBaseFile.GetAt(linebase))!=0)&&
 950                                                 (m_arYourFile.GetAt(lineyour).Compare(m_arTheirFile.GetAt(linetheir))!=0)))
 951                                         {
 952                                                 m_Diff3.SetState(i, DIFFSTATE_CONFLICTED_IGNORED);
 953                                                 m_YourBaseBoth.SetState(i, DIFFSTATE_CONFLICTADDED);
 954                                                 m_TheirBaseBoth.SetState(i, DIFFSTATE_CONFLICTADDED);
 955                                         }
 956                                 }
 957                         }
 958                 }
 959         }
 960         ASSERT(m_Diff3.GetCount() == m_YourBaseBoth.GetCount());
 961         ASSERT(m_TheirBaseBoth.GetCount() == m_YourBaseBoth.GetCount());
 962
 963         TRACE(_T("done with 3-way diff\n"));
 964
 965         HideUnchangedSections(&m_Diff3, &m_YourBaseBoth, &m_TheirBaseBoth);
 966
 967         return true;
 968 }
 969
 970 void CDiffData::HideUnchangedSections(CViewData * data1, CViewData * data2, CViewData * data3) const
 971 {
 972         if (data1 == NULL)
 973                 return;
 974
 975         CRegDWORD contextLines = CRegDWORD(_T("Software\\TortoiseGitMerge\\ContextLines"), 1);
 976
 977         if (data1->GetCount() > 1)
 978         {
 979                 HIDESTATE lastHideState = data1->GetHideState(0);
 980                 if (lastHideState == HIDESTATE_HIDDEN)
 981                 {
 982                         data1->SetLineHideState(0, HIDESTATE_MARKER);
 983                         if (data2)
 984                                 data2->SetLineHideState(0, HIDESTATE_MARKER);
 985                         if (data3)
 986                                 data3->SetLineHideState(0, HIDESTATE_MARKER);
 987                 }
 988                 for (int i = 1; i < data1->GetCount(); ++i)
 989                 {
 990                         HIDESTATE hideState = data1->GetHideState(i);
 991                         if (hideState != lastHideState)
 992                         {
 993                                 if (hideState == HIDESTATE_SHOWN)
 994                                 {
 995                                         // go back and show the last 'contextLines' lines to "SHOWN"
 996                                         int lineback = i - 1;
 997                                         int stopline = lineback - (int)(DWORD)contextLines;
 998                                         while ((lineback >= 0)&&(lineback > stopline))
 999                                         {
1000                                                 data1->SetLineHideState(lineback, HIDESTATE_SHOWN);
1001                                                 if (data2)
1002                                                         data2->SetLineHideState(lineback, HIDESTATE_SHOWN);
1003                                                 if (data3)
1004                                                         data3->SetLineHideState(lineback, HIDESTATE_SHOWN);
1005                                                 lineback--;
1006                                         }
1007                                 }
1008                                 else if ((hideState == HIDESTATE_HIDDEN)&&(lastHideState != HIDESTATE_MARKER))
1009                                 {
1010                                         // go forward and show the next 'contextLines' lines to "SHOWN"
1011                                         int lineforward = i + 1;
1012                                         int stopline = lineforward + (int)(DWORD)contextLines;
1013                                         while ((lineforward < data1->GetCount())&&(lineforward < stopline))
1014                                         {
1015                                                 data1->SetLineHideState(lineforward, HIDESTATE_SHOWN);
1016                                                 if (data2)
1017                                                         data2->SetLineHideState(lineforward, HIDESTATE_SHOWN);
1018                                                 if (data3)
1019                                                         data3->SetLineHideState(lineforward, HIDESTATE_SHOWN);
1020                                                 lineforward++;
1021                                         }
1022                                         if ((lineforward < data1->GetCount())&&(data1->GetHideState(lineforward) == HIDESTATE_HIDDEN))
1023                                         {
1024                                                 data1->SetLineHideState(lineforward, HIDESTATE_MARKER);
1025                                                 if (data2)
1026                                                         data2->SetLineHideState(lineforward, HIDESTATE_MARKER);
1027                                                 if (data3)
1028                                                         data3->SetLineHideState(lineforward, HIDESTATE_MARKER);
1029                                         }
1030                                 }
1031                         }
1032                         lastHideState = hideState;
1033                 }
1034         }
1035 }
1036
1037 void CDiffData::SetCommentTokens( const CString& sLineStart, const CString& sBlockStart, const CString& sBlockEnd )
1038 {
1039         m_CommentLineStart      = sLineStart;
1040         m_CommentBlockStart     = sBlockStart;
1041         m_CommentBlockEnd       = sBlockEnd;
1042 }
1043
1044 void CDiffData::SetRegexTokens( const std::wregex& rx, const std::wstring& replacement )
1045 {
1046         m_rx                    = rx;
1047         m_replacement   = replacement;
1048 }