1 /////////////////////////////////////////////////////////////////////////////
2 // WinMerge: an interactive diff/merge utility
3 // Copyright (C) 1997-2000 Thingamahoochie Software
6 // This program is free software; you can redistribute it and/or modify
7 // it under the terms of the GNU General Public License as published by
8 // the Free Software Foundation; either version 2 of the License, or
9 // (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software
18 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 /////////////////////////////////////////////////////////////////////////////
24 * @brief Implementation file for CMergeDoc
31 #include <Poco/Timestamp.h>
32 #include "UnicodeString.h"
35 #include "DiffTextBuffer.h"
36 #include "Environment.h"
37 #include "MovedLines.h"
38 #include "MergeEditView.h"
39 #include "MergeEditFrm.h"
42 #include "FileTransform.h"
45 #include "OptionsDef.h"
46 #include "DiffFileInfo.h"
47 #include "SaveClosingDlg.h"
50 #include "OptionsMgr.h"
51 #include "OptionsDiffOptions.h"
52 #include "MergeLineFlags.h"
53 #include "FileOrFolderSelect.h"
54 #include "LineFiltersList.h"
56 #include "codepage_detect.h"
57 #include "SelectUnpackerDlg.h"
58 #include "EncodingErrorBar.h"
59 #include "MergeCmdLineInfo.h"
61 #include "Constants.h"
62 #include "Merge7zFormatMergePluginImpl.h"
64 #include "PatchTool.h"
67 #include "stringdiffs.h"
75 /** @brief Max len of path in caption. */
76 static const UINT CAPTION_PATH_MAX = 50;
78 int CMergeDoc::m_nBuffersTemp = 2;
80 /** @brief EOL types */
81 static LPCTSTR crlfs[] =
83 _T ("\x0d\x0a"), // DOS/Windows style
84 _T ("\x0a"), // UNIX style
85 _T ("\x0d") // Macintosh style
88 static void SaveBuffForDiff(CDiffTextBuffer & buf, const String& filepath, int nStartLine = 0, int nLines = -1);
90 /////////////////////////////////////////////////////////////////////////////
93 IMPLEMENT_DYNCREATE(CMergeDoc, CDocument)
95 BEGIN_MESSAGE_MAP(CMergeDoc, CDocument)
96 //{{AFX_MSG_MAP(CMergeDoc)
97 ON_COMMAND(ID_FILE_SAVE, OnFileSave)
98 ON_COMMAND(ID_FILE_SAVE_LEFT, OnFileSaveLeft)
99 ON_COMMAND(ID_FILE_SAVE_MIDDLE, OnFileSaveMiddle)
100 ON_COMMAND(ID_FILE_SAVE_RIGHT, OnFileSaveRight)
101 ON_COMMAND(ID_FILE_SAVEAS_LEFT, OnFileSaveAsLeft)
102 ON_UPDATE_COMMAND_UI(ID_FILE_SAVEAS_MIDDLE, OnUpdateFileSaveAsMiddle)
103 ON_COMMAND(ID_FILE_SAVEAS_MIDDLE, OnFileSaveAsMiddle)
104 ON_COMMAND(ID_FILE_SAVEAS_RIGHT, OnFileSaveAsRight)
105 ON_UPDATE_COMMAND_UI(ID_STATUS_DIFFNUM, OnUpdateStatusNum)
106 ON_UPDATE_COMMAND_UI(ID_STATUS_PLUGIN, OnUpdatePluginName)
107 ON_COMMAND(ID_TOOLS_GENERATEREPORT, OnToolsGenerateReport)
108 ON_COMMAND(ID_TOOLS_GENERATEPATCH, OnToolsGeneratePatch)
109 ON_COMMAND(ID_RESCAN, OnFileReload)
110 ON_COMMAND(ID_FILE_ENCODING, OnFileEncoding)
111 ON_COMMAND_RANGE(ID_VIEW_DIFFCONTEXT_ALL, ID_VIEW_DIFFCONTEXT_TOGGLE, OnDiffContext)
112 ON_UPDATE_COMMAND_UI_RANGE(ID_VIEW_DIFFCONTEXT_ALL, ID_VIEW_DIFFCONTEXT_TOGGLE, OnUpdateDiffContext)
113 ON_COMMAND(ID_POPUP_OPEN_WITH_UNPACKER, OnCtxtOpenWithUnpacker)
114 ON_BN_CLICKED(IDC_FILEENCODING, OnBnClickedFileEncoding)
115 ON_BN_CLICKED(IDC_PLUGIN, OnBnClickedPlugin)
116 ON_BN_CLICKED(IDC_HEXVIEW, OnBnClickedHexView)
117 ON_COMMAND(IDOK, OnOK)
118 ON_COMMAND(ID_MERGE_COMPARE_TEXT, OnFileRecompareAsText)
119 ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_TEXT, OnUpdateFileRecompareAsText)
120 ON_COMMAND(ID_MERGE_COMPARE_XML, OnFileRecompareAsXML)
121 ON_UPDATE_COMMAND_UI(ID_MERGE_COMPARE_XML, OnUpdateFileRecompareAsXML)
122 ON_COMMAND_RANGE(ID_MERGE_COMPARE_HEX, ID_MERGE_COMPARE_IMAGE, OnFileRecompareAs)
126 /////////////////////////////////////////////////////////////////////////////
127 // CMergeDoc construction/destruction
130 * @brief Constructor.
132 CMergeDoc::CMergeDoc()
133 : m_bEnableRescan(true)
137 , m_pInfoUnpacker(new PackingInfo)
138 , m_pEncodingErrorBar(nullptr)
139 , m_bHasSyncPoints(false)
140 , m_bAutoMerged(false)
144 DIFFOPTIONS options = {0};
146 m_nBuffers = m_nBuffersTemp;
147 m_filePaths.SetSize(m_nBuffers);
149 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
151 m_ptBuf[nBuffer].reset(new CDiffTextBuffer(this, nBuffer));
152 m_pSaveFileInfo[nBuffer].reset(new DiffFileInfo());
153 m_pRescanFileInfo[nBuffer].reset(new DiffFileInfo());
154 m_nBufferType[nBuffer] = BUFFER_NORMAL;
155 m_bEditAfterRescan[nBuffer] = false;
159 m_bEnableRescan = true;
160 // COleDateTime m_LastRescan
161 curUndo = undoTgt.begin();
162 m_nDiffContext = GetOptionsMgr()->GetInt(OPT_DIFF_CONTEXT);
164 m_diffWrapper.SetDetectMovedBlocks(GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS));
165 Options::DiffOptions::Load(GetOptionsMgr(), options);
167 m_diffWrapper.SetOptions(&options);
168 m_diffWrapper.SetPrediffer(nullptr);
174 * Informs associated dirdoc that mergedoc is closing.
176 CMergeDoc::~CMergeDoc()
178 if (m_pDirDoc != nullptr)
180 m_pDirDoc->MergeDocClosing(this);
186 * @brief Deleted data associated with doc before closing.
188 void CMergeDoc::DeleteContents ()
190 CDocument::DeleteContents ();
191 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
193 m_ptBuf[nBuffer]->FreeAll ();
194 m_tempFiles[nBuffer].Delete();
199 * @brief Called when new document is created.
201 * Initialises buffers.
203 BOOL CMergeDoc::OnNewDocument()
205 if (!CDocument::OnNewDocument())
208 SetTitle(_("File Comparison").c_str());
210 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
211 m_ptBuf[nBuffer]->InitNew ();
216 * @brief Return active merge edit view (or left one if neither active)
218 CMergeEditView * CMergeDoc::GetActiveMergeView()
220 CView * pActiveView = GetParentFrame()->GetActiveView();
221 CMergeEditView * pMergeEditView = dynamic_cast<CMergeEditView *>(pActiveView);
222 if (pMergeEditView == nullptr)
223 pMergeEditView = GetView(0, 0); // default to left view (in case some location or detail view active)
224 return pMergeEditView;
227 CMergeEditView * CMergeDoc::GetActiveMergeGroupView(int nBuffer)
229 return m_pView[GetActiveMergeView()->m_nThisGroup][nBuffer];
232 void CMergeDoc::SetUnpacker(const PackingInfo * infoNewHandler)
234 if (infoNewHandler != nullptr)
236 *m_pInfoUnpacker = *infoNewHandler;
240 void CMergeDoc::SetPrediffer(const PrediffingInfo * infoPrediffer)
242 m_diffWrapper.SetPrediffer(infoPrediffer);
244 void CMergeDoc::GetPrediffer(PrediffingInfo * infoPrediffer)
246 m_diffWrapper.GetPrediffer(infoPrediffer);
249 /////////////////////////////////////////////////////////////////////////////
250 // CMergeDoc serialization
252 void CMergeDoc::Serialize(CArchive& ar)
254 ASSERT(false); // we do not use CDocument serialization
257 /////////////////////////////////////////////////////////////////////////////
258 // CMergeDoc commands
261 * @brief Save an editor text buffer to a file for prediffing (make UCS-2LE if appropriate)
264 * original file is Ansi :
265 * buffer -> save as Ansi -> Ansi plugins -> diffutils
266 * original file is Unicode (UCS2-LE, UCS2-BE, UTF-8) :
267 * buffer -> save as UTF-8 -> Unicode plugins -> convert to UTF-8 -> diffutils
268 * (the plugins are optional, not the conversion)
269 * @todo Show SaveToFile() errors?
271 static void SaveBuffForDiff(CDiffTextBuffer & buf, const String& filepath, int nStartLine, int nLines)
273 // and we don't repack the file
274 PackingInfo * tempPacker = nullptr;
276 // write buffer out to temporary file
278 int retVal = buf.SaveToFile(filepath, true, sError, tempPacker,
279 CRLF_STYLE_AUTOMATIC, false, nStartLine, nLines);
283 * @brief Save files to temp files & compare again.
285 * @param bBinary [in,out] [in] If true, compare two binary files
286 * [out] If true binary file was detected.
287 * @param bIdentical [out] If true files were identical
288 * @param bForced [in] If true, suppressing is ignored and rescan
290 * @return Tells if rescan was successfully, was suppressed, or
292 * If this code is OK, Rescan has detached the views temporarily
293 * (positions of cursors have been lost)
294 * @note Rescan() ALWAYS compares temp files. Actual user files are not
295 * touched by Rescan().
296 * @sa CDiffWrapper::RunFileDiff()
298 int CMergeDoc::Rescan(bool &bBinary, IDENTLEVEL &identical,
299 bool bForced /* =false */)
301 DIFFOPTIONS diffOptions = {0};
302 DiffFileInfo fileInfo;
303 bool diffSuccess = false;
304 int nResult = RESCAN_OK;
305 FileChange FileChanged[3] = {FileNoChange, FileNoChange, FileNoChange};
310 if (!m_bEnableRescan)
311 return RESCAN_SUPPRESSED;
314 ClearWordDiffCache();
316 if (GetOptionsMgr()->GetBool(OPT_LINEFILTER_ENABLED))
318 m_diffWrapper.SetFilterList(theApp.m_pLineFilters->GetAsString());
322 m_diffWrapper.SetFilterList(_T(""));
324 m_diffWrapper.SetFilterCommentsManager(theApp.m_pFilterCommentsManager.get());
326 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
328 // Check if files have been modified since last rescan
329 // Ignore checking in case of scratchpads (empty filenames)
330 if (!m_filePaths[nBuffer].empty())
332 FileChanged[nBuffer] = IsFileChangedOnDisk(m_filePaths[nBuffer].c_str(),
333 fileInfo, false, nBuffer);
336 m_LastRescan = COleDateTime::GetCurrentTime();
338 LPCTSTR tnames[] = {_T("t0_wmdoc"), _T("t1_wmdoc"), _T("t2_wmdoc")};
339 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
341 if (FileChanged[nBuffer] == FileRemoved)
343 String msg = strutils::format_string1(_("The file\n%1\nhas disappeared. Please save a copy of the file to continue."), m_filePaths[nBuffer]);
344 ShowMessageBox(msg, MB_ICONWARNING);
345 bool bSaveResult = false;
346 bool ok = DoSaveAs(m_filePaths[nBuffer].c_str(), bSaveResult, nBuffer);
347 if (!ok || !bSaveResult)
349 return RESCAN_FILE_ERR;
353 String temp = m_tempFiles[nBuffer].GetPath();
355 temp = m_tempFiles[nBuffer].Create(tnames[nBuffer]);
357 return RESCAN_TEMP_ERR;
362 String tempPath = env::GetTemporaryPath();
364 // Set up DiffWrapper
365 m_diffWrapper.GetOptions(&diffOptions);
370 // Clear moved lines lists
371 if (m_diffWrapper.GetDetectMovedBlocks())
373 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
374 m_diffWrapper.GetMovedLines(nBuffer)->Clear();
377 // Set paths for diffing and run diff
378 m_diffWrapper.EnablePlugins(GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED));
380 m_diffWrapper.SetPaths(PathContext(m_tempFiles[0].GetPath(), m_tempFiles[1].GetPath()), true);
382 m_diffWrapper.SetPaths(PathContext(m_tempFiles[0].GetPath(), m_tempFiles[1].GetPath(), m_tempFiles[2].GetPath()), true);
383 m_diffWrapper.SetCompareFiles(m_filePaths);
387 if (!HasSyncPoints())
389 // Save text buffer to file
390 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
392 m_ptBuf[nBuffer]->SetTempPath(tempPath);
393 SaveBuffForDiff(*m_ptBuf[nBuffer], m_tempFiles[nBuffer].GetPath());
396 m_diffWrapper.SetCreateDiffList(&m_diffList);
397 diffSuccess = m_diffWrapper.RunFileDiff();
400 m_diffWrapper.GetDiffStatus(&status);
401 if (bBinary) // believe caller if we were told these are binaries
402 status.bBinaries = true;
406 const std::vector<std::vector<int> > syncpoints = GetSyncPointList();
407 int nStartLine[3] = {0};
408 int nLines[3], nRealLine[3];
409 for (size_t i = 0; i <= syncpoints.size(); ++i)
411 // Save text buffer to file
412 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
414 nLines[nBuffer] = (i >= syncpoints.size()) ? -1 : syncpoints[i][nBuffer] - nStartLine[nBuffer];
415 m_ptBuf[nBuffer]->SetTempPath(tempPath);
416 SaveBuffForDiff(*m_ptBuf[nBuffer], m_tempFiles[nBuffer].GetPath(),
417 nStartLine[nBuffer], nLines[nBuffer]);
421 m_diffWrapper.SetCreateDiffList(&templist);
422 diffSuccess = m_diffWrapper.RunFileDiff();
423 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
424 nRealLine[nBuffer] = m_ptBuf[nBuffer]->ComputeRealLine(nStartLine[nBuffer]);
425 m_diffList.AppendDiffList(templist, nRealLine);
426 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
427 nStartLine[nBuffer] += nLines[nBuffer];
430 DIFFSTATUS status_part;
431 m_diffWrapper.GetDiffStatus(&status_part);
432 if (bBinary) // believe caller if we were told these are binaries
433 status.bBinaries = true;
434 status.MergeStatus(status_part);
436 m_diffWrapper.SetCreateDiffList(&m_diffList);
439 // If one file has EOL before EOF and other not...
440 if (std::count(status.bMissingNL, status.bMissingNL + m_nBuffers, status.bMissingNL[0]) < m_nBuffers)
442 // ..last DIFFRANGE of file which has EOL must be
443 // fixed to contain last line too
444 int lineCount[3] = { 0,0,0 };
445 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
446 lineCount[nBuffer] = m_ptBuf[nBuffer]->GetLineCount();
447 m_diffWrapper.FixLastDiffRange(m_nBuffers, lineCount, status.bMissingNL, diffOptions.bIgnoreBlankLines);
450 // set identical/diff result as recorded by diffutils
451 identical = status.Identical;
453 // Determine errors and binary file compares
455 nResult = RESCAN_FILE_ERR;
456 else if (status.bBinaries)
462 // Now update views and buffers for ghost lines
464 // Prevent displaying views during this update
465 // BTW, this solves the problem of double asserts
466 // (during the display of an assert message box, a second assert in one of the
467 // display functions happens, and hides the first assert)
468 ForEachView([](auto& pView) { pView->DetachFromBuffer(); });
470 // Remove blank lines and clear winmerge flags
471 // this operation does not change the modified flag
472 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
473 m_ptBuf[nBuffer]->prepareForRescan();
475 // Divide diff blocks to match lines.
476 if (GetOptionsMgr()->GetBool(OPT_CMP_MATCH_SIMILAR_LINES) && m_nBuffers < 3)
479 // Analyse diff-list (updating real line-numbers)
480 // this operation does not change the modified flag
483 // Hide identical lines if diff-context is not 'All'
486 // Apply flags to lines that are trivial
487 PrediffingInfo infoPrediffer;
488 GetPrediffer(&infoPrediffer);
489 if (!infoPrediffer.m_PluginName.empty())
492 // Apply flags to lines that moved, to differentiate from appeared/disappeared lines
493 if (m_diffWrapper.GetDetectMovedBlocks())
496 // After PrimeTextBuffers() we know amount of real diffs
497 // (m_nDiffs) and trivial diffs (m_nTrivialDiffs)
499 // Identical files are also updated
500 if (!m_diffList.HasSignificantDiffs())
501 identical = IDENTLEVEL_ALL;
503 ForEachView([](auto& pView) {
504 // just apply some options to the views
505 pView->PrimeListWithFile();
506 // Now buffers data are valid
507 pView->ReAttachToBuffer();
509 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
511 m_bEditAfterRescan[nBuffer] = false;
515 if (!GetOptionsMgr()->GetBool(OPT_CMP_IGNORE_CODEPAGE) &&
516 identical == IDENTLEVEL_ALL &&
517 std::any_of(m_ptBuf, m_ptBuf + m_nBuffers,
518 [&](std::unique_ptr<CDiffTextBuffer>& buf) { return buf->getEncoding() != m_ptBuf[0]->getEncoding(); }))
519 identical = IDENTLEVEL_NONE;
521 GetParentFrame()->SetLastCompareResult(identical != IDENTLEVEL_ALL ? 1 : 0);
526 void CMergeDoc::CheckFileChanged(void)
529 DiffFileInfo fileInfo;
530 FileChange FileChange[3];
532 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
534 FileChange[nBuffer] = IsFileChangedOnDisk(m_filePaths[nBuffer].c_str(), fileInfo,
537 m_pRescanFileInfo[nBuffer]->Update((LPCTSTR)m_filePaths[nBuffer].c_str());
540 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
542 if (FileChange[nBuffer] == FileChanged)
544 String msg = strutils::format_string1(_("Another application has updated file\n%1\nsince WinMerge scanned it last time.\n\nDo you want to reload the file?"), m_filePaths[nBuffer]);
545 if (ShowMessageBox(msg, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN, IDS_FILECHANGED_RESCAN) == IDYES)
554 /** @brief Apply flags to lines that are trivial */
555 void CMergeDoc::FlagTrivialLines(void)
557 for (int i = 0; i < m_ptBuf[0]->GetLineCount(); ++i)
559 if ((m_ptBuf[0]->GetLineFlags(i) & LF_NONTRIVIAL_DIFF) == 0)
562 for (int file = 0; file < m_nBuffers; ++file)
564 const TCHAR *p = m_ptBuf[file]->GetLineChars(i);
565 str[file] = p ? p : _T("");
568 if (std::count(str + 1, str + m_nBuffers, str[0]) != m_nBuffers - 1)
570 DIFFOPTIONS diffOptions = {0};
571 m_diffWrapper.GetOptions(&diffOptions);
573 // Make the call to stringdiffs, which does all the hard & tedious computations
574 std::vector<strdiff::wdiff> worddiffs = strdiff::ComputeWordDiffs(m_nBuffers, str,
575 !diffOptions.bIgnoreCase,
576 !diffOptions.bIgnoreEol,
577 diffOptions.nIgnoreWhitespace,
578 GetBreakType(), // whitespace only or include punctuation
579 GetByteColoringOption());
580 if (!worddiffs.empty())
582 for (int file = 0; file < m_nBuffers; ++file)
583 m_ptBuf[file]->SetLineFlag(i, LF_TRIVIAL, true, false, false);
590 /** @brief Adjust all different lines that were detected as actually matching moved lines */
591 void CMergeDoc::FlagMovedLines(void)
594 MovedLines *pMovedLines;
596 pMovedLines = m_diffWrapper.GetMovedLines(0);
597 for (i = 0; i < m_ptBuf[0]->GetLineCount(); ++i)
599 int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_RIGHT);
602 TRACE(_T("%d->%d\n"), i, j);
604 // We only flag lines that are already marked as being different
605 int apparent = m_ptBuf[0]->ComputeApparentLine(i);
606 if (m_ptBuf[0]->FlagIsSet(apparent, LF_DIFF))
608 m_ptBuf[0]->SetLineFlag(apparent, LF_MOVED, true, false, false);
613 pMovedLines = m_diffWrapper.GetMovedLines(1);
614 for (i=0; i<m_ptBuf[1]->GetLineCount(); ++i)
616 int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_LEFT);
619 TRACE(_T("%d->%d\n"), i, j);
621 // We only flag lines that are already marked as being different
622 int apparent = m_ptBuf[1]->ComputeApparentLine(i);
623 if (m_ptBuf[1]->FlagIsSet(apparent, LF_DIFF))
625 m_ptBuf[1]->SetLineFlag(apparent, LF_MOVED, true, false, false);
633 pMovedLines = m_diffWrapper.GetMovedLines(1);
634 for (i=0; i<m_ptBuf[1]->GetLineCount(); ++i)
636 int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_RIGHT);
639 TRACE(_T("%d->%d\n"), i, j);
641 // We only flag lines that are already marked as being different
642 int apparent = m_ptBuf[1]->ComputeApparentLine(i);
643 if (m_ptBuf[1]->FlagIsSet(apparent, LF_DIFF))
645 m_ptBuf[1]->SetLineFlag(apparent, LF_MOVED, true, false, false);
650 pMovedLines = m_diffWrapper.GetMovedLines(2);
651 for (i=0; i<m_ptBuf[2]->GetLineCount(); ++i)
653 int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_LEFT);
656 TRACE(_T("%d->%d\n"), i, j);
658 // We only flag lines that are already marked as being different
659 int apparent = m_ptBuf[2]->ComputeApparentLine(i);
660 if (m_ptBuf[2]->FlagIsSet(apparent, LF_DIFF))
662 m_ptBuf[2]->SetLineFlag(apparent, LF_MOVED, true, false, false);
667 // todo: Need to record actual moved information
670 int CMergeDoc::ShowMessageBox(const String& sText, unsigned nType, unsigned nIDHelp)
672 if (m_pView[0][0] && m_pView[0][0]->IsTextBufferInitialized() && !GetParentFrame()->IsActivated())
674 GetParentFrame()->InitialUpdateFrame(this, true);
675 GetParentFrame()->SendMessageToDescendants(WM_IDLEUPDATECMDUI, static_cast<WPARAM>(true), 0, true, true);
677 return AfxMessageBox(sText.c_str(), nType, nIDHelp);
681 * @brief Prints (error) message by rescan status.
683 * @param nRescanResult [in] Resultcocode from rescan().
684 * @param bIdentical [in] Were files identical?.
685 * @sa CMergeDoc::Rescan()
687 void CMergeDoc::ShowRescanError(int nRescanResult, IDENTLEVEL identical)
689 // Rescan was suppressed, there is no sensible status
690 if (nRescanResult == RESCAN_SUPPRESSED)
695 if (nRescanResult == RESCAN_FILE_ERR)
697 s = _("An error occurred while comparing the files.");
699 ShowMessageBox(s, MB_ICONSTOP);
703 if (nRescanResult == RESCAN_TEMP_ERR)
705 s = _("Temporary files could not be created. Check your temporary path settings.");
707 ShowMessageBox(s, MB_ICONSTOP);
711 // Files are not binaries, but they are identical
712 if (identical != IDENTLEVEL_NONE)
714 if (!m_filePaths.GetLeft().empty() && !m_filePaths.GetMiddle().empty() && !m_filePaths.GetRight().empty() &&
715 m_filePaths.GetLeft() == m_filePaths.GetRight() && m_filePaths.GetMiddle() == m_filePaths.GetRight())
717 // compare file to itself, a custom message so user may hide the message in this case only
718 s = _("The same file is opened in both panels.");
719 ShowMessageBox(s, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN, IDS_FILE_TO_ITSELF);
721 else if (identical == IDENTLEVEL_ALL)
723 UINT nFlags = MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN;
725 if (theApp.m_bExitIfNoDiff == MergeCmdLineInfo::Exit)
727 // Show the "files are identical" for basic "exit no diff" flag
728 // If user don't want to see the message one uses the quiet version
729 // of the "exit no diff".
730 nFlags &= ~MB_DONT_DISPLAY_AGAIN;
733 if (theApp.m_bExitIfNoDiff != MergeCmdLineInfo::ExitQuiet)
735 s = _("The selected files are identical.");
736 ShowMessageBox(s, nFlags, IDS_FILESSAME);
739 // Exit application if files are identical.
740 if (theApp.m_bExitIfNoDiff == MergeCmdLineInfo::Exit ||
741 theApp.m_bExitIfNoDiff == MergeCmdLineInfo::ExitQuiet)
743 AfxGetMainWnd()->PostMessage(WM_COMMAND, ID_APP_EXIT);
749 bool CMergeDoc::Undo()
755 * @brief An instance of RescanSuppress prevents rescan during its lifetime
756 * (or until its Clear method is called, which ends its effect).
761 explicit RescanSuppress(CMergeDoc & doc) : m_doc(doc)
764 m_bPrev = doc.m_bEnableRescan;
765 m_doc.m_bEnableRescan = false;
772 m_doc.m_bEnableRescan = m_bPrev;
786 * @brief Copy all diffs from one side to side.
787 * @param [in] srcPane Source side from which diff is copied
788 * @param [in] dstPane Destination side
790 void CMergeDoc::CopyAllList(int srcPane, int dstPane)
792 CopyMultipleList(srcPane, dstPane, 0, m_diffList.GetSize() - 1);
796 * @brief Copy range of diffs from one side to side.
797 * This function copies given range of differences from side to another.
798 * Ignored differences are skipped, and not copied.
799 * @param [in] srcPane Source side from which diff is copied
800 * @param [in] dstPane Destination side
801 * @param [in] firstDiff First diff copied (0-based index)
802 * @param [in] lastDiff Last diff copied (0-based index)
804 void CMergeDoc::CopyMultipleList(int srcPane, int dstPane, int firstDiff, int lastDiff, int firstWordDiff, int lastWordDiff)
807 if (firstDiff > lastDiff)
808 _RPTF0(_CRT_ERROR, "Invalid diff range (firstDiff > lastDiff)!");
810 _RPTF0(_CRT_ERROR, "Invalid diff range (firstDiff < 0)!");
811 if (lastDiff > m_diffList.GetSize() - 1)
812 _RPTF0(_CRT_ERROR, "Invalid diff range (lastDiff < diffcount)!");
815 lastDiff = min(m_diffList.GetSize() - 1, lastDiff);
816 firstDiff = max(0, firstDiff);
817 if (firstDiff > lastDiff)
820 RescanSuppress suppressRescan(*this);
822 // Note we don't care about m_nDiffs count to become zero,
823 // because we don't rescan() so it does not change
825 SetCurrentDiff(lastDiff);
827 bool bGroupWithPrevious = false;
828 if (firstWordDiff <= 0 && lastWordDiff == -1)
830 if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious, true))
831 return; // sync failure
835 if (!WordListCopy(srcPane, dstPane, lastDiff,
836 (firstDiff == lastDiff) ? firstWordDiff : 0, lastWordDiff, nullptr, bGroupWithPrevious, true))
837 return; // sync failure
840 SetEditedAfterRescan(dstPane);
842 int nGroup = GetActiveMergeView()->m_nThisGroup;
843 CMergeEditView *pViewSrc = m_pView[nGroup][srcPane];
844 CMergeEditView *pViewDst = m_pView[nGroup][dstPane];
845 CPoint currentPosSrc = pViewSrc->GetCursorPos();
847 CPoint currentPosDst = pViewDst->GetCursorPos();
851 pViewDst->SetCursorPos(pt);
852 pViewDst->SetNewSelection(pt, pt, false);
853 pViewDst->SetNewAnchor(pt);
855 // copy from bottom up is more efficient
856 for (int i = lastDiff - 1; i >= firstDiff; --i)
858 if (m_diffList.IsDiffSignificant(i))
861 const DIFFRANGE *pdi = m_diffList.DiffRangeAt(i);
862 if (currentPosDst.y > pdi->dend)
864 if (pdi->blank[dstPane] >= 0)
865 currentPosDst.y -= pdi->dend - pdi->blank[dstPane] + 1;
866 else if (pdi->blank[srcPane] >= 0)
867 currentPosDst.y -= pdi->dend - pdi->blank[srcPane] + 1;
869 // Group merge with previous (merge undo data to one action)
870 bGroupWithPrevious = true;
871 if (i > firstDiff || firstWordDiff <= 0)
873 if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious, false))
874 break; // sync failure
878 if (!WordListCopy(srcPane, dstPane, firstDiff, firstWordDiff, -1, nullptr, bGroupWithPrevious, false))
879 break; // sync failure
884 ForEachView(dstPane, [currentPosDst](auto& pView) {
885 pView->SetCursorPos(currentPosDst);
886 pView->SetNewSelection(currentPosDst, currentPosDst, false);
887 pView->SetNewAnchor(currentPosDst);
890 suppressRescan.Clear(); // done suppress Rescan
894 enum MergeResult { NoMergeNeeded, Merged, Conflict };
897 static std::pair<MergeResult, Type> DoMergeValue(Type left, Type middle, Type right, int dstPane)
899 bool equal_all = middle == left && middle == right && left == right;
901 return std::pair<MergeResult, Type>(NoMergeNeeded, left);
902 bool conflict = middle != left && middle != right && left != right;
904 return std::pair<MergeResult, Type>(Conflict, left);
909 return std::pair<MergeResult, Type>(Merged, middle);
913 return std::pair<MergeResult, Type>(Merged, right);
915 return std::pair<MergeResult, Type>(Merged, left);
919 return std::pair<MergeResult, Type>(Merged, middle);
922 return std::pair<MergeResult, Type>(NoMergeNeeded, left);
926 * @brief Do auto-merge.
927 * @param [in] dstPane Destination side
929 void CMergeDoc::DoAutoMerge(int dstPane)
931 const int lastDiff = m_diffList.GetSize() - 1;
932 const int firstDiff = 0;
933 bool bGroupWithPrevious = false;
934 int autoMergedCount = 0;
935 int unresolvedConflictCount = 0;
937 std::pair<MergeResult, FileTextEncoding> mergedEncoding =
938 DoMergeValue(m_ptBuf[0]->getEncoding(), m_ptBuf[1]->getEncoding(), m_ptBuf[2]->getEncoding(), dstPane);
939 if (mergedEncoding.first == Merged)
941 ShowMessageBox(_("The change of codepage has been merged"), MB_ICONINFORMATION);
942 m_ptBuf[dstPane]->setEncoding(mergedEncoding.second);
944 else if (mergedEncoding.first == Conflict)
945 ShowMessageBox(_("The changes of codepage are conflicting"), MB_ICONINFORMATION);
947 std::pair<MergeResult, CRLFSTYLE> mergedEOLStyle =
948 DoMergeValue(m_ptBuf[0]->GetCRLFMode(), m_ptBuf[1]->GetCRLFMode(), m_ptBuf[2]->GetCRLFMode(), dstPane);
949 if (mergedEOLStyle.first == Merged)
951 ShowMessageBox(_("The change of EOL has been merged"), MB_ICONINFORMATION);
952 m_ptBuf[dstPane]->SetCRLFMode(mergedEOLStyle.second);
954 else if (mergedEOLStyle.first == Conflict)
955 ShowMessageBox(_("The changes of EOL are conflicting"), MB_ICONINFORMATION);
957 RescanSuppress suppressRescan(*this);
959 // Note we don't care about m_nDiffs count to become zero,
960 // because we don't rescan() so it does not change
962 SetCurrentDiff(lastDiff);
964 SetEditedAfterRescan(dstPane);
966 int nGroup = GetActiveMergeView()->m_nThisGroup;
967 CMergeEditView *pViewDst = m_pView[nGroup][dstPane];
968 CPoint currentPosDst = pViewDst->GetCursorPos();
972 pViewDst->SetCursorPos(pt);
973 pViewDst->SetNewSelection(pt, pt, false);
974 pViewDst->SetNewAnchor(pt);
976 // copy from bottom up is more efficient
977 for (int i = lastDiff; i >= firstDiff; --i)
979 const DIFFRANGE *pdi = m_diffList.DiffRangeAt(i);
980 const int srcPane = m_diffList.GetMergeableSrcIndex(i, dstPane);
984 if (currentPosDst.y > pdi->dend)
986 if (pdi->blank[dstPane] >= 0)
987 currentPosDst.y -= pdi->dend - pdi->blank[dstPane] + 1;
988 else if (pdi->blank[srcPane] >= 0)
989 currentPosDst.y -= pdi->dend - pdi->blank[srcPane] + 1;
991 // Group merge with previous (merge undo data to one action)
992 if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious, false))
993 break; // sync failure
994 if (!bGroupWithPrevious)
995 bGroupWithPrevious = true;
998 if (pdi->op == OP_DIFF)
999 ++unresolvedConflictCount;
1002 ForEachView(dstPane, [currentPosDst](auto& pView) {
1003 pView->SetCursorPos(currentPosDst);
1004 pView->SetNewSelection(currentPosDst, currentPosDst, false);
1005 pView->SetNewAnchor(currentPosDst);
1008 suppressRescan.Clear(); // done suppress Rescan
1010 UpdateHeaderPath(dstPane);
1012 if (autoMergedCount > 0)
1013 m_bAutoMerged = true;
1015 // move to first conflict
1016 const int nDiff = m_diffList.FirstSignificant3wayDiff(THREEWAYDIFFTYPE_CONFLICT);
1018 pViewDst->SelectDiff(nDiff, true, false);
1021 strutils::format_string2(
1022 _T("The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"),
1023 strutils::format(_T("%d"), autoMergedCount),
1024 strutils::format(_T("%d"), unresolvedConflictCount)),
1025 MB_ICONINFORMATION);
1029 * @brief Sanity check difference.
1031 * Checks that lines in difference are inside difference in both files.
1032 * If file is edited, lines added or removed diff lines get out of sync and
1033 * merging fails miserably.
1035 * @param [in] dr Difference to check.
1036 * @return true if difference lines match, false otherwise.
1038 bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr) const
1040 const int cd_dbegin = dr.dbegin;
1041 const int cd_dend = dr.dend;
1043 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
1045 // Must ensure line number is in range before getting line flags
1046 if (cd_dend >= m_ptBuf[nBuffer]->GetLineCount())
1049 // Optimization - check last line first so we don't need to
1050 // check whole diff for obvious cases
1051 DWORD dwFlags = m_ptBuf[nBuffer]->GetLineFlags(cd_dend);
1052 if (!(dwFlags & LF_WINMERGE_FLAGS))
1056 for (int line = cd_dbegin; line < cd_dend; line++)
1058 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
1060 DWORD dwFlags = m_ptBuf[nBuffer]->GetLineFlags(cd_dend);
1061 if (!(dwFlags & LF_WINMERGE_FLAGS))
1069 * @brief Copy selected (=current) difference from from side to side.
1070 * @param [in] srcPane Source side from which diff is copied
1071 * @param [in] dstPane Destination side
1072 * @param [in] nDiff Diff to copy, if -1 function determines it.
1073 * @param [in] bGroupWithPrevious Adds diff to same undo group with
1074 * @return true if ok, false if sync failure & need to abort copy
1075 * previous action (allows one undo for copy all)
1077 bool CMergeDoc::ListCopy(int srcPane, int dstPane, int nDiff /* = -1*/,
1078 bool bGroupWithPrevious /*= false*/, bool bUpdateView /*= true*/)
1080 int nGroup = GetActiveMergeView()->m_nThisGroup;
1081 CMergeEditView *pViewSrc = m_pView[nGroup][srcPane];
1082 CMergeEditView *pViewDst = m_pView[nGroup][dstPane];
1083 CCrystalTextView *pSource = bUpdateView ? pViewDst : nullptr;
1085 // suppress Rescan during this method
1086 // (Not only do we not want to rescan a lot of times, but
1087 // it will wreck the line status array to rescan as we merge)
1088 RescanSuppress suppressRescan(*this);
1090 // If diff-number not given, determine it from active view
1093 nDiff = GetCurrentDiff();
1095 // No current diff, but maybe cursor is in diff?
1096 if (nDiff == -1 && (pViewSrc->IsCursorInDiff() ||
1097 pViewDst->IsCursorInDiff()))
1099 // Find out diff under cursor
1100 CPoint ptCursor = GetActiveMergeView()->GetCursorPos();
1101 nDiff = m_diffList.LineToDiff(ptCursor.y);
1108 VERIFY(m_diffList.GetDiff(nDiff, cd));
1109 CDiffTextBuffer& sbuf = *m_ptBuf[srcPane];
1110 CDiffTextBuffer& dbuf = *m_ptBuf[dstPane];
1111 bool bSrcWasMod = sbuf.IsModified();
1112 const int cd_dbegin = cd.dbegin;
1113 const int cd_dend = cd.dend;
1114 const int cd_blank = cd.blank[srcPane];
1115 bool bInSync = SanityCheckDiff(cd);
1119 LangMessageBox(IDS_VIEWS_OUTOFSYNC, MB_ICONSTOP);
1120 return false; // abort copying
1123 // If we remove whole diff from current view, we must fix cursor
1124 // position first. Normally we would move to end of previous line,
1125 // but we want to move to begin of that line for usability.
1128 CPoint currentPos = pViewDst->GetCursorPos();
1130 if (currentPos.y > cd_dend)
1132 if (cd.blank[dstPane] >= 0)
1133 currentPos.y -= cd_dend - cd.blank[dstPane] + 1;
1134 else if (cd.blank[srcPane] >= 0)
1135 currentPos.y -= cd_dend - cd.blank[srcPane] + 1;
1137 ForEachView(dstPane, [currentPos](auto& pView) { pView->SetCursorPos(currentPos); });
1140 // if the current diff contains missing lines, remove them from both sides
1141 int limit = cd_dend;
1143 // curView is the view which is changed, so the opposite of the source view
1144 dbuf.BeginUndoGroup(bGroupWithPrevious);
1147 // text was missing, so delete rest of lines on both sides
1148 // delete only on destination side since rescan will clear the other side
1149 if (cd_dend + 1 < dbuf.GetLineCount())
1151 dbuf.DeleteText(pSource, cd_blank, 0, cd_dend+1, 0, CE_ACTION_MERGE);
1155 // To removing EOL chars of last line, deletes from the end of the line (cd_blank - 1).
1156 ASSERT(cd_blank > 0);
1157 dbuf.DeleteText(pSource, cd_blank-1, dbuf.GetLineLength(cd_blank-1), cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE);
1161 dbuf.FlushUndoGroup(pSource);
1162 dbuf.BeginUndoGroup(true);
1166 // copy the selected text over
1167 if (cd_dbegin <= limit)
1169 // text exists on left side, so just replace
1170 dbuf.ReplaceFullLines(dbuf, sbuf, pSource, cd_dbegin, limit, CE_ACTION_MERGE);
1171 dbuf.FlushUndoGroup(pSource);
1172 dbuf.BeginUndoGroup(true);
1174 dbuf.FlushUndoGroup(pSource);
1179 // reset the mod status of the source view because we do make some
1180 // changes, but none that concern the source text
1181 sbuf.SetModified(bSrcWasMod);
1184 suppressRescan.Clear(); // done suppress Rescan
1189 bool CMergeDoc::WordListCopy(int srcPane, int dstPane, int nDiff, int firstWordDiff, int lastWordDiff,
1190 const std::vector<int> *pWordDiffIndice, bool bGroupWithPrevious /*= false*/, bool bUpdateView /*= true*/)
1192 int nGroup = GetActiveMergeView()->m_nThisGroup;
1193 CMergeEditView *pViewSrc = m_pView[nGroup][srcPane];
1194 CMergeEditView *pViewDst = m_pView[nGroup][dstPane];
1195 CCrystalTextView *pSource = bUpdateView ? pViewDst : nullptr;
1197 // suppress Rescan during this method
1198 // (Not only do we not want to rescan a lot of times, but
1199 // it will wreck the line status array to rescan as we merge)
1200 RescanSuppress suppressRescan(*this);
1203 VERIFY(m_diffList.GetDiff(nDiff, cd));
1204 CDiffTextBuffer& sbuf = *m_ptBuf[srcPane];
1205 CDiffTextBuffer& dbuf = *m_ptBuf[dstPane];
1206 bool bSrcWasMod = sbuf.IsModified();
1207 const int cd_dbegin = cd.dbegin;
1208 const int cd_dend = cd.dend;
1209 const int cd_blank = cd.blank[srcPane];
1210 bool bInSync = SanityCheckDiff(cd);
1214 LangMessageBox(IDS_VIEWS_OUTOFSYNC, MB_ICONSTOP);
1215 return false; // abort copying
1218 std::vector<WordDiff> worddiffs = GetWordDiffArrayInDiffBlock(nDiff);
1220 if (worddiffs.empty())
1223 if (cd.end[srcPane] < cd.begin[srcPane])
1224 return ListCopy(srcPane, dstPane, nDiff, bGroupWithPrevious, bUpdateView);
1226 if (firstWordDiff == -1)
1228 if (lastWordDiff == -1)
1229 lastWordDiff = static_cast<int>(worddiffs.size() - 1);
1231 // If we remove whole diff from current view, we must fix cursor
1232 // position first. Normally we would move to end of previous line,
1233 // but we want to move to begin of that line for usability.
1236 CPoint currentPos = pViewDst->GetCursorPos();
1238 if (currentPos.y > cd_dend)
1240 if (cd.blank[dstPane] >= 0)
1241 currentPos.y -= cd_dend - cd.blank[dstPane] + 1;
1242 else if (cd.blank[srcPane] >= 0)
1243 currentPos.y -= cd_dend - cd.blank[srcPane] + 1;
1245 ForEachView(dstPane, [currentPos](auto& pView) { pView->SetCursorPos(currentPos); });
1248 // if the current diff contains missing lines, remove them from both sides
1249 int limit = cd_dend;
1251 // curView is the view which is changed, so the opposite of the source view
1252 dbuf.BeginUndoGroup(bGroupWithPrevious);
1254 CString srcText, dstText;
1255 CPoint ptDstStart, ptDstEnd;
1256 CPoint ptSrcStart, ptSrcEnd;
1258 ptDstStart.x = worddiffs[firstWordDiff].begin[dstPane];
1259 ptDstStart.y = worddiffs[firstWordDiff].beginline[dstPane];
1260 ptDstEnd.x = worddiffs[lastWordDiff].end[dstPane];
1261 ptDstEnd.y = worddiffs[lastWordDiff].endline[dstPane];
1262 ptSrcStart.x = worddiffs[firstWordDiff].begin[srcPane];
1263 ptSrcStart.y = worddiffs[firstWordDiff].beginline[srcPane];
1264 ptSrcEnd.x = worddiffs[lastWordDiff].end[srcPane];
1265 ptSrcEnd.y = worddiffs[lastWordDiff].endline[srcPane];
1267 std::vector<int> nDstOffsets(ptDstEnd.y - ptDstStart.y + 2);
1268 std::vector<int> nSrcOffsets(ptSrcEnd.y - ptSrcStart.y + 2);
1270 dbuf.GetTextWithoutEmptys(ptDstStart.y, ptDstStart.x, ptDstEnd.y, ptDstEnd.x, dstText);
1271 sbuf.GetTextWithoutEmptys(ptSrcStart.y, ptSrcStart.x, ptSrcEnd.y, ptSrcEnd.x, srcText);
1274 for (int nLine = ptDstStart.y; nLine <= ptDstEnd.y; nLine++)
1275 nDstOffsets[nLine-ptDstStart.y+1] = nDstOffsets[nLine-ptDstStart.y] + dbuf.GetFullLineLength(nLine);
1277 for (int nLine = ptSrcStart.y; nLine <= ptSrcEnd.y; nLine++)
1278 nSrcOffsets[nLine-ptSrcStart.y+1] = nSrcOffsets[nLine-ptSrcStart.y] + sbuf.GetFullLineLength(nLine);
1280 for (int i = lastWordDiff; i != firstWordDiff-1; --i)
1282 if (pWordDiffIndice && std::find(pWordDiffIndice->begin(), pWordDiffIndice->end(), i) == pWordDiffIndice->end())
1284 int srcBegin = nSrcOffsets[worddiffs[i].beginline[srcPane] - ptSrcStart.y] + worddiffs[i].begin[srcPane];
1285 int srcEnd = nSrcOffsets[worddiffs[i].endline[srcPane] - ptSrcStart.y] + worddiffs[i].end[srcPane];
1286 int dstBegin = nDstOffsets[worddiffs[i].beginline[dstPane] - ptDstStart.y] + worddiffs[i].begin[dstPane];
1287 int dstEnd = nDstOffsets[worddiffs[i].endline[dstPane] - ptDstStart.y] + worddiffs[i].end[dstPane];
1288 dstText = dstText.Mid(0, dstBegin - ptDstStart.x)
1289 + srcText.Mid(srcBegin - ptSrcStart.x, srcEnd - srcBegin)
1290 + dstText.Mid(dstEnd - ptDstStart.x);
1293 dbuf.DeleteText(pSource, ptDstStart.y, ptDstStart.x, ptDstEnd.y, ptDstEnd.x, CE_ACTION_MERGE);
1296 dbuf.InsertText(pSource, ptDstStart.y, ptDstStart.x, dstText, dstText.GetLength(), endl, endc, CE_ACTION_MERGE);
1298 dbuf.FlushUndoGroup(pSource);
1300 // reset the mod status of the source view because we do make some
1301 // changes, but none that concern the source text
1302 sbuf.SetModified(bSrcWasMod);
1304 suppressRescan.Clear(); // done suppress Rescan
1311 * @brief Save file with new filename.
1313 * This function is called by CMergeDoc::DoSave() or CMergeDoc::DoSAveAs()
1314 * to save file with new filename. CMergeDoc::DoSave() calls if saving with
1315 * normal filename fails, to let user choose another filename/location.
1316 * Also, if file is unnamed file (e.g. scratchpad) then it must be saved
1317 * using this function.
1318 * @param [in, out] strPath
1319 * - [in] : Initial path shown to user
1320 * - [out] : Path to new filename if saving succeeds
1321 * @param [in, out] nSaveResult
1322 * - [in] : Statuscode telling why we ended up here. Maybe the result of
1324 * - [out] : Statuscode of this saving try
1325 * @param [in, out] sError Error string from lower level saving code
1326 * @param [in] nBuffer Buffer we are saving
1327 * @return false as long as the user is not satisfied. Calling function
1328 * should not continue until true is returned.
1329 * @sa CMergeDoc::DoSave()
1330 * @sa CMergeDoc::DoSaveAs()
1331 * @sa CMergeDoc::CDiffTextBuffer::SaveToFile()
1333 bool CMergeDoc::TrySaveAs(String &strPath, int &nSaveResult, String & sError,
1334 int nBuffer, PackingInfo * pInfoTempUnpacker)
1338 String strSavePath; // New path for next saving try
1341 int answer = IDOK; // Set default we use for scratchpads
1343 // We shouldn't get here if saving is succeed before
1344 ASSERT(nSaveResult != SAVE_DONE);
1346 // Select message based on reason function called
1347 if (nSaveResult == SAVE_PACK_FAILED)
1349 if (m_nBuffers == 3)
1351 str = strutils::format_string2(
1353 _("Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?")
1355 _("Plugin '%2' cannot pack your changes to the middle file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"):
1356 _("Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?")),
1357 strPath, pInfoTempUnpacker->m_PluginName);
1361 str = strutils::format_string2(nBuffer == 0 ? _("Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?") :
1362 _("Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"),
1363 strPath, pInfoTempUnpacker->m_PluginName);
1365 // replace the unpacker with a "do nothing" unpacker
1366 pInfoTempUnpacker->Initialize(PLUGIN_MANUAL);
1370 str = strutils::format_string2(_("Saving file failed.\n%1\n%2\nDo you want to:\n\t-use a different filename (Press Ok)\n\t-abort the current operation (Press Cancel)?"), strPath, sError);
1373 // SAVE_NO_FILENAME is temporarily used for scratchpad.
1374 // So don't ask about saving in that case.
1375 if (nSaveResult != SAVE_NO_FILENAME)
1376 answer = ShowMessageBox(str, MB_OKCANCEL | MB_ICONWARNING);
1382 title = _("Save Left File As");
1383 else if (nBuffer == m_nBuffers - 1)
1384 title = _("Save Right File As");
1386 title = _("Save Middle File As");
1388 if (SelectFile(GetActiveMergeView()->GetSafeHwnd(), s, false, strPath.c_str(), title))
1390 CDiffTextBuffer *pBuffer = m_ptBuf[nBuffer].get();
1392 nSaveResult = pBuffer->SaveToFile(strSavePath, false, sError,
1395 if (nSaveResult == SAVE_DONE)
1397 // We are saving scratchpad (unnamed file)
1398 if (strPath.empty())
1400 m_nBufferType[nBuffer] = BUFFER_UNNAMED_SAVED;
1401 m_strDesc[nBuffer].erase();
1404 strPath = strSavePath;
1405 UpdateHeaderPath(nBuffer);
1411 nSaveResult = SAVE_CANCELLED;
1415 nSaveResult = SAVE_CANCELLED;
1422 * @brief Save file creating backups etc.
1424 * Safe top-level file saving function. Checks validity of given path.
1425 * Creates backup file if wanted to. And if saving to given path fails,
1426 * allows user to select new location/name for file.
1427 * @param [in] szPath Path where to save including filename. Can be
1428 * empty/`nullptr` if new file is created (scratchpad) without filename.
1429 * @param [out] bSaveSuccess Will contain information about save success with
1430 * the original name (to determine if file statuses should be changed)
1431 * @param [in] nBuffer Index (0-based) of buffer to save
1432 * @return Tells if caller can continue (no errors happened)
1433 * @note Return value does not tell if SAVING succeeded. Caller must
1434 * Check value of bSaveSuccess parameter after calling this function!
1435 * @note If CMainFrame::m_strSaveAsPath is non-empty, file is saved
1436 * to directory it points to. If m_strSaveAsPath contains filename,
1437 * that filename is used.
1438 * @sa CMergeDoc::TrySaveAs()
1439 * @sa CMainFrame::CheckSavePath()
1440 * @sa CMergeDoc::CDiffTextBuffer::SaveToFile()
1442 bool CMergeDoc::DoSave(LPCTSTR szPath, bool &bSaveSuccess, int nBuffer)
1444 DiffFileInfo fileInfo;
1445 String strSavePath(szPath);
1446 FileChange fileChanged;
1447 bool bApplyToAll = false;
1450 fileChanged = IsFileChangedOnDisk(szPath, fileInfo, true, nBuffer);
1451 if (fileChanged == FileChanged)
1453 String msg = strutils::format_string1(_("Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"), szPath);
1454 if (ShowMessageBox(msg, MB_ICONWARNING | MB_YESNO) == IDNO)
1456 bSaveSuccess = true;
1461 // use a temp packer
1462 // first copy the m_pInfoUnpacker
1463 // if an error arises during packing, change and take a "do nothing" packer
1464 PackingInfo infoTempUnpacker = *m_pInfoUnpacker;
1466 bSaveSuccess = false;
1468 // Check third arg possibly given from command-line
1469 if (!theApp.m_strSaveAsPath.empty())
1471 if (paths::DoesPathExist(theApp.m_strSaveAsPath) == paths::IS_EXISTING_DIR)
1473 // third arg was a directory, so get append the filename
1475 paths::SplitFilename(szPath, 0, &sname, 0);
1476 strSavePath = theApp.m_strSaveAsPath;
1477 strSavePath = paths::ConcatPath(strSavePath, sname);
1480 strSavePath = theApp.m_strSaveAsPath;
1483 nRetVal = theApp.HandleReadonlySave(strSavePath, false, bApplyToAll);
1484 if (nRetVal == IDCANCEL)
1487 if (!theApp.CreateBackup(false, strSavePath))
1490 // false as long as the user is not satisfied
1491 // true if saving succeeds, even with another filename, or if the user cancels
1492 bool result = false;
1493 // the error code from the latest save operation,
1494 // or SAVE_DONE when the save succeeds
1495 // TODO: Shall we return this code in addition to bSaveSuccess ?
1496 int nSaveErrorCode = SAVE_DONE;
1497 CDiffTextBuffer *pBuffer = m_ptBuf[nBuffer].get();
1499 // Assume empty filename means Scratchpad (unnamed file)
1500 // Todo: This is not needed? - buffer type check should be enough
1501 if (strSavePath.empty())
1502 nSaveErrorCode = SAVE_NO_FILENAME;
1504 // Handle unnamed buffers
1505 if (m_nBufferType[nBuffer] == BUFFER_UNNAMED)
1506 nSaveErrorCode = SAVE_NO_FILENAME;
1509 if (nSaveErrorCode == SAVE_DONE)
1510 // We have a filename, just try to save
1511 nSaveErrorCode = pBuffer->SaveToFile(strSavePath, false, sError, &infoTempUnpacker);
1513 if (nSaveErrorCode != SAVE_DONE)
1515 // Saving failed, user may save to another location if wants to
1517 result = TrySaveAs(strSavePath, nSaveErrorCode, sError, nBuffer, &infoTempUnpacker);
1521 // Saving succeeded with given/selected filename
1522 if (nSaveErrorCode == SAVE_DONE)
1524 // Preserve file times if user wants to
1525 if (GetOptionsMgr()->GetBool(OPT_PRESERVE_FILETIMES))
1527 fileInfo.SetFile(strSavePath);
1530 TFile file(strSavePath);
1531 file.setLastModified(fileInfo.mtime);
1538 m_ptBuf[nBuffer]->SetModified(false);
1539 m_pSaveFileInfo[nBuffer]->Update(strSavePath.c_str());
1540 m_filePaths[nBuffer] = strSavePath;
1541 m_pRescanFileInfo[nBuffer]->Update(m_filePaths[nBuffer].c_str());
1542 UpdateHeaderPath(nBuffer);
1543 bSaveSuccess = true;
1546 else if (nSaveErrorCode == SAVE_CANCELLED)
1548 // User cancelled current operation, lets do what user wanted to do
1555 * @brief Save file with different filename.
1557 * Safe top-level file saving function. Asks user to select filename
1558 * and path. Does not create backups.
1559 * @param [in] szPath Path where to save including filename. Can be
1560 * empty/`nullptr` if new file is created (scratchpad) without filename.
1561 * @param [out] bSaveSuccess Will contain information about save success with
1562 * the original name (to determine if file statuses should be changed)
1563 * @param [in] nBuffer Index (0-based) of buffer to save
1564 * @return Tells if caller can continue (no errors happened)
1565 * @note Return value does not tell if SAVING succeeded. Caller must
1566 * Check value of bSaveSuccess parameter after calling this function!
1567 * @sa CMergeDoc::TrySaveAs()
1568 * @sa CMainFrame::CheckSavePath()
1569 * @sa CMergeDoc::CDiffTextBuffer::SaveToFile()
1571 bool CMergeDoc::DoSaveAs(LPCTSTR szPath, bool &bSaveSuccess, int nBuffer)
1573 String strSavePath(szPath);
1575 // use a temp packer
1576 // first copy the m_pInfoUnpacker
1577 // if an error arises during packing, change and take a "do nothing" packer
1578 PackingInfo infoTempUnpacker = *m_pInfoUnpacker;
1580 bSaveSuccess = false;
1581 // false as long as the user is not satisfied
1582 // true if saving succeeds, even with another filename, or if the user cancels
1583 bool result = false;
1584 // the error code from the latest save operation,
1585 // or SAVE_DONE when the save succeeds
1586 // TODO: Shall we return this code in addition to bSaveSuccess ?
1587 int nSaveErrorCode = SAVE_DONE;
1589 // Use SAVE_NO_FILENAME to prevent asking about error
1590 nSaveErrorCode = SAVE_NO_FILENAME;
1592 // Loop until user succeeds saving or cancels
1595 result = TrySaveAs(strSavePath, nSaveErrorCode, sError, nBuffer, &infoTempUnpacker);
1598 // Saving succeeded with given/selected filename
1599 if (nSaveErrorCode == SAVE_DONE)
1601 m_pSaveFileInfo[nBuffer]->Update(strSavePath);
1602 m_filePaths[nBuffer] = strSavePath;
1603 m_pRescanFileInfo[nBuffer]->Update(m_filePaths[nBuffer]);
1604 UpdateHeaderPath(nBuffer);
1605 bSaveSuccess = true;
1612 * @brief Get left->right info for a moved line (apparent line number)
1614 int CMergeDoc::RightLineInMovedBlock(int nBuffer, int apparentLeftLine)
1616 if (!(m_ptBuf[nBuffer]->GetLineFlags(apparentLeftLine) & LF_MOVED))
1619 int realLeftLine = m_ptBuf[nBuffer]->ComputeRealLine(apparentLeftLine);
1620 int realRightLine = -1;
1621 if (m_diffWrapper.GetDetectMovedBlocks())
1623 realRightLine = m_diffWrapper.GetMovedLines(nBuffer)->LineInBlock(realLeftLine,
1624 MovedLines::SIDE_RIGHT);
1626 if (realRightLine != -1)
1627 return m_ptBuf[nBuffer + 1]->ComputeApparentLine(realRightLine);
1633 * @brief Get right->left info for a moved line (apparent line number)
1635 int CMergeDoc::LeftLineInMovedBlock(int nBuffer, int apparentRightLine)
1637 if (!(m_ptBuf[nBuffer]->GetLineFlags(apparentRightLine) & LF_MOVED))
1640 int realRightLine = m_ptBuf[nBuffer]->ComputeRealLine(apparentRightLine);
1641 int realLeftLine = -1;
1642 if (m_diffWrapper.GetDetectMovedBlocks())
1644 realLeftLine = m_diffWrapper.GetMovedLines(nBuffer)->LineInBlock(realRightLine,
1645 MovedLines::SIDE_LEFT);
1647 if (realLeftLine != -1)
1648 return m_ptBuf[nBuffer - 1]->ComputeApparentLine(realLeftLine);
1654 * @brief Save modified documents.
1655 * This function asks if user wants to save modified documents. We also
1656 * allow user to cancel the closing.
1658 * There is a special trick avoiding showing two save-dialogs, as MFC framework
1659 * sometimes calls this function twice. We use static counter for these calls
1660 * and if we already have saving in progress (counter == 1) we skip the new
1663 * @return true if docs are closed, false if closing is cancelled.
1665 BOOL CMergeDoc::SaveModified()
1672 if (PromptAndSaveIfNeeded(true))
1685 * @brief Sets the current difference.
1686 * @param [in] nDiff Difference to set as current difference.
1688 void CMergeDoc::SetCurrentDiff(int nDiff)
1690 if (nDiff >= 0 && nDiff <= m_diffList.LastSignificantDiff())
1697 * @brief Take care of rescanning document.
1699 * Update view and restore cursor and scroll position after
1700 * rescanning document.
1701 * @param [in] bForced If true rescan cannot be suppressed
1703 void CMergeDoc::FlushAndRescan(bool bForced /* =false */)
1705 // Ignore suppressing when forced rescan
1707 if (!m_bEnableRescan) return;
1709 CWaitCursor waitstatus;
1711 CMergeEditView *pActiveView = GetActiveMergeView();
1713 // store cursors and hide caret
1714 ForEachView([](auto& pView) { pView->PushCursors(); });
1715 pActiveView->HideCursor();
1717 bool bBinary = false;
1718 IDENTLEVEL identical = IDENTLEVEL_NONE;
1719 int nRescanResult = Rescan(bBinary, identical, bForced);
1721 // restore cursors and caret
1722 ForEachView([](auto& pView) { pView->PopCursors(); });
1723 pActiveView->ShowCursor();
1725 ForEachView(pActiveView->m_nThisPane, [](auto& pView) {
1726 // because of ghostlines, m_nTopLine may differ just after Rescan
1727 // scroll both views to the same top line
1728 pView->UpdateSiblingScrollPos(false);
1730 // make sure we see the cursor from the curent view
1731 pView->EnsureVisible(pView->GetCursorPos());
1735 UpdateAllViews(nullptr);
1737 // Show possible error after updating screen
1738 if (nRescanResult != RESCAN_SUPPRESSED)
1739 ShowRescanError(nRescanResult, identical);
1740 m_LastRescan = COleDateTime::GetCurrentTime();
1744 * @brief Saves both files
1746 void CMergeDoc::OnFileSave()
1748 // We will need to know if either of the originals actually changed
1749 // so we know whether to update the diff status
1750 bool bChangedOriginal = false;
1752 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
1754 if (m_ptBuf[nBuffer]->IsModified() && !m_ptBuf[nBuffer]->GetReadOnly())
1756 // (why we don't use return value of DoSave)
1757 // DoSave will return true if it wrote to something successfully
1758 // but we have to know if it overwrote the original file
1759 bool bSaveOriginal = false;
1760 DoSave(m_filePaths[nBuffer].c_str(), bSaveOriginal, nBuffer );
1762 bChangedOriginal = true;
1766 // If either of the actual source files being compared was changed
1767 // we need to update status in the dir view
1768 if (bChangedOriginal)
1770 // If DirDoc contains diffs
1771 if (m_pDirDoc != nullptr && m_pDirDoc->HasDiffs())
1773 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
1775 if (m_bEditAfterRescan[nBuffer])
1777 FlushAndRescan(false);
1782 bool bIdentical = !m_diffList.HasSignificantDiffs(); // True if status should be set to identical
1783 m_pDirDoc->UpdateChangedItem(m_filePaths, m_diffList.GetSignificantDiffs(),
1784 m_nTrivialDiffs, bIdentical);
1789 void CMergeDoc::DoFileSave(int nBuffer)
1791 bool bSaveSuccess = false;
1792 bool bModified = false;
1794 if (m_ptBuf[nBuffer]->IsModified() && !m_ptBuf[nBuffer]->GetReadOnly())
1797 DoSave(m_filePaths[nBuffer].c_str(), bSaveSuccess, nBuffer );
1800 // If file were modified and saving succeeded,
1801 // update status on dir view
1802 if (bModified && bSaveSuccess)
1804 // If DirDoc contains compare results
1805 if (m_pDirDoc != nullptr && m_pDirDoc->HasDiffs())
1807 for (int nBuffer1 = 0; nBuffer1 < m_nBuffers; nBuffer1++)
1809 if (m_bEditAfterRescan[nBuffer1])
1811 FlushAndRescan(false);
1816 bool bIdentical = !m_diffList.HasSignificantDiffs(); // True if status should be set to identical
1817 m_pDirDoc->UpdateChangedItem(m_filePaths, m_diffList.GetSignificantDiffs(),
1818 m_nTrivialDiffs, bIdentical);
1824 * @brief Saves left-side file
1826 void CMergeDoc::OnFileSaveLeft()
1832 * @brief Saves middle-side file
1834 void CMergeDoc::OnFileSaveMiddle()
1840 * @brief Saves right-side file
1842 void CMergeDoc::OnFileSaveRight()
1844 DoFileSave(m_nBuffers - 1);
1848 * @brief Saves left-side file with name asked
1850 void CMergeDoc::OnFileSaveAsLeft()
1852 bool bSaveResult = false;
1853 DoSaveAs(m_filePaths.GetLeft().c_str(), bSaveResult, 0);
1857 * @brief Called when "Save middle (as...)" item is updated
1859 void CMergeDoc::OnUpdateFileSaveAsMiddle(CCmdUI* pCmdUI)
1861 pCmdUI->Enable(m_nBuffers == 3);
1865 * @brief Saves right-side file with name asked
1867 void CMergeDoc::OnFileSaveAsMiddle()
1869 bool bSaveResult = false;
1870 DoSaveAs(m_filePaths.GetMiddle().c_str(), bSaveResult, 1);
1874 * @brief Saves right-side file with name asked
1876 void CMergeDoc::OnFileSaveAsRight()
1878 bool bSaveResult = false;
1879 DoSaveAs(m_filePaths.GetRight().c_str(), bSaveResult, m_nBuffers - 1);
1883 * @brief Update diff-number pane text in file compare.
1884 * The diff number pane shows selected difference/amount of differences when
1885 * there is difference selected. If there is no difference selected, then
1886 * the panel shows amount of differences. If there are ignored differences,
1887 * those are not count into numbers.
1888 * @param [in] pCmdUI UI component to update.
1890 void CMergeDoc::OnUpdateStatusNum(CCmdUI* pCmdUI)
1892 TCHAR sIdx[32] = { 0 };
1893 TCHAR sCnt[32] = { 0 };
1895 const int nDiffs = m_diffList.GetSignificantDiffs();
1897 // Files are identical - show text "Identical"
1901 // There are differences, but no selected diff
1902 // - show amount of diffs
1903 else if (GetCurrentDiff() < 0)
1905 s = nDiffs == 1 ? _("1 Difference Found") : _("%1 Differences Found");
1906 _itot_s(nDiffs, sCnt, 10);
1907 strutils::replace(s, _T("%1"), sCnt);
1910 // There are differences and diff selected
1911 // - show diff number and amount of diffs
1914 s = _("Difference %1 of %2");
1915 const int signInd = m_diffList.GetSignificantIndex(GetCurrentDiff());
1916 _itot_s(signInd + 1, sIdx, 10);
1917 strutils::replace(s, _T("%1"), sIdx);
1918 _itot_s(nDiffs, sCnt, 10);
1919 strutils::replace(s, _T("%2"), sCnt);
1921 pCmdUI->SetText(s.c_str());
1925 * @brief Update plugin name
1926 * @param [in] pCmdUI UI component to update.
1928 void CMergeDoc::OnUpdatePluginName(CCmdUI* pCmdUI)
1931 if (m_pInfoUnpacker && !m_pInfoUnpacker->m_PluginName.empty())
1932 pluginNames += m_pInfoUnpacker->m_PluginName + _T("&");
1933 PrediffingInfo prediffer;
1934 GetPrediffer(&prediffer);
1935 if (!prediffer.m_PluginName.empty())
1936 pluginNames += prediffer.m_PluginName + _T("&");
1937 pCmdUI->SetText(pluginNames.substr(0, pluginNames.length() - 1).c_str());
1941 * @brief Change number of diff context lines
1943 void CMergeDoc::OnDiffContext(UINT nID)
1947 case ID_VIEW_DIFFCONTEXT_0:
1948 m_nDiffContext = 0; break;
1949 case ID_VIEW_DIFFCONTEXT_1:
1950 m_nDiffContext = 1; break;
1951 case ID_VIEW_DIFFCONTEXT_3:
1952 m_nDiffContext = 3; break;
1953 case ID_VIEW_DIFFCONTEXT_5:
1954 m_nDiffContext = 5; break;
1955 case ID_VIEW_DIFFCONTEXT_7:
1956 m_nDiffContext = 7; break;
1957 case ID_VIEW_DIFFCONTEXT_9:
1958 m_nDiffContext = 9; break;
1959 case ID_VIEW_DIFFCONTEXT_TOGGLE:
1960 m_nDiffContext = -m_nDiffContext - 1; break;
1961 case ID_VIEW_DIFFCONTEXT_ALL:
1962 if (m_nDiffContext >= 0)
1963 m_nDiffContext = -m_nDiffContext - 1;
1966 GetOptionsMgr()->SaveOption(OPT_DIFF_CONTEXT, m_nDiffContext);
1967 FlushAndRescan(true);
1971 * @brief Update number of diff context lines
1973 void CMergeDoc::OnUpdateDiffContext(CCmdUI* pCmdUI)
1976 switch (pCmdUI->m_nID)
1978 case ID_VIEW_DIFFCONTEXT_0:
1979 bCheck = (m_nDiffContext == 0); break;
1980 case ID_VIEW_DIFFCONTEXT_1:
1981 bCheck = (m_nDiffContext == 1); break;
1982 case ID_VIEW_DIFFCONTEXT_3:
1983 bCheck = (m_nDiffContext == 3); break;
1984 case ID_VIEW_DIFFCONTEXT_5:
1985 bCheck = (m_nDiffContext == 5); break;
1986 case ID_VIEW_DIFFCONTEXT_7:
1987 bCheck = (m_nDiffContext == 7); break;
1988 case ID_VIEW_DIFFCONTEXT_9:
1989 bCheck = (m_nDiffContext == 9); break;
1990 case ID_VIEW_DIFFCONTEXT_TOGGLE:
1991 bCheck = false; break;
1993 bCheck = (m_nDiffContext < 0); break;
1995 pCmdUI->SetCheck(bCheck);
1996 pCmdUI->Enable(true);
2000 * @brief Build the diff array and prepare buffers accordingly (insert ghost lines, set WinMerge flags)
2002 * @note After PrimeTextBuffers(), all buffers should have the same length.
2004 void CMergeDoc::PrimeTextBuffers()
2007 m_nTrivialDiffs = 0;
2009 int nDiffCount = m_diffList.GetSize();
2012 // walk the diff list and calculate numbers of extra lines to add
2013 int extras[3] = {0, 0, 0}; // extra lines added to each view
2014 m_diffList.GetExtraLinesCounts(m_nBuffers, extras);
2016 // resize m_aLines once for each view
2017 UINT lcount[3] = {0, 0, 0};
2018 UINT lcountnew[3] = {0, 0, 0};
2021 for (file = 0; file < m_nBuffers; file++)
2023 lcount[file] = m_ptBuf[file]->GetLineCount();
2024 lcountnew[file] = lcount[file] + extras[file];
2025 lcountmax = max(lcountmax, lcountnew[file]);
2027 for (file = 0; file < m_nBuffers; file++)
2029 m_ptBuf[file]->m_aLines.resize(lcountmax);
2032 // walk the diff list backward, move existing lines to proper place,
2033 // add ghost lines, and set flags
2034 for (nDiff = nDiffCount - 1; nDiff >= 0; nDiff --)
2037 VERIFY(m_diffList.GetDiff(nDiff, curDiff));
2039 // move matched lines after curDiff
2040 int nline[3] = { 0, 0, 0 };
2041 for (file = 0; file < m_nBuffers; file++)
2042 nline[file] = lcount[file] - curDiff.end[file] - 1; // #lines on left/middle/right after current diff
2043 // Matched lines should really match...
2044 // But matched lines after last diff may differ because of empty last line (see function's note)
2045 if (nDiff < nDiffCount - 1)
2046 ASSERT(nline[0] == nline[1]);
2049 for (file = 0; file < m_nBuffers; file++)
2051 // Move all lines after current diff down as far as needed
2052 // for any ghost lines we're about to insert
2053 m_ptBuf[file]->MoveLine(curDiff.end[file]+1, lcount[file]-1, lcountnew[file]-nline[file]);
2054 lcountnew[file] -= nline[file];
2055 lcount[file] -= nline[file];
2056 // move unmatched lines and add ghost lines
2057 nline[file] = curDiff.end[file] - curDiff.begin[file] + 1; // #lines in diff on left/middle/right
2058 nmaxline = max(nmaxline, nline[file]);
2061 for (file = 0; file < m_nBuffers; file++)
2063 DWORD dflag = LF_GHOST;
2064 if ((file == 0 && curDiff.op == OP_3RDONLY) || (file == 2 && curDiff.op == OP_1STONLY))
2066 m_ptBuf[file]->MoveLine(curDiff.begin[file], curDiff.end[file], lcountnew[file]-nmaxline);
2067 int nextra = nmaxline - nline[file];
2070 m_ptBuf[file]->SetEmptyLine(lcountnew[file] - nextra, nextra);
2071 for (int i = 1; i <= nextra; i++)
2072 m_ptBuf[file]->SetLineFlag(lcountnew[file]-i, dflag, true, false, false);
2074 lcountnew[file] -= nmaxline;
2076 lcount[file] -= nline[file];
2079 // set dbegin, dend, blank, and line flags
2080 curDiff.dbegin = lcountnew[0];
2086 // fall through and handle as diff
2093 curDiff.dend = lcountnew[0]+nmaxline-1;
2094 for (file = 0; file < m_nBuffers; file++)
2096 curDiff.blank[file] = -1;
2097 int nextra = nmaxline - nline[file];
2098 if (nmaxline > nline[file])
2100 // more lines on left, ghost lines on right side
2101 curDiff.blank[file] = curDiff.dend + 1 - nextra;
2107 for (file = 0; file < m_nBuffers; file++)
2111 for (i = curDiff.dbegin; i <= curDiff.dend; i++)
2113 if (curDiff.blank[file] == -1 || (int)i < curDiff.blank[file])
2115 // set diff or trivial flag
2116 DWORD dflag = (curDiff.op == OP_TRIVIAL) ? LF_TRIVIAL : LF_DIFF;
2117 if ((file == 0 && curDiff.op == OP_3RDONLY) || (file == 2 && curDiff.op == OP_1STONLY))
2119 m_ptBuf[file]->SetLineFlag(i, dflag, true, false, false);
2120 m_ptBuf[file]->SetLineFlag(i, LF_INVISIBLE, false, false, false);
2124 // ghost lines are already inserted (and flagged)
2125 // ghost lines opposite to trivial lines are ghost and trivial
2126 if (curDiff.op == OP_TRIVIAL)
2127 m_ptBuf[file]->SetLineFlag(i, LF_TRIVIAL, true, false, false);
2133 } // switch (curDiff.op)
2134 VERIFY(m_diffList.SetDiff(nDiff, curDiff));
2135 } // for (nDiff = nDiffCount; nDiff-- > 0; )
2137 m_diffList.ConstructSignificantChain();
2140 // Note: By this point all `m_ptBuf[]` buffers must have the same
2141 // number of line entries; eventual buffer processing typically
2142 // uses the line count from `m_ptBuf[0]` for all buffer processing.
2144 for (file = 0; file < m_nBuffers; file++)
2146 ASSERT(m_ptBuf[0]->GetLineCount() == m_ptBuf[file]->GetLineCount());
2150 for (file = 0; file < m_nBuffers; file++)
2151 m_ptBuf[file]->FinishLoading();
2155 * @brief Checks if file has changed since last update (save or rescan).
2156 * @param [in] szPath File to check
2157 * @param [in] dfi Previous fileinfo of file
2158 * @param [in] bSave If true Compare to last save-info, else to rescan-info
2159 * @param [in] nBuffer Index (0-based) of buffer
2160 * @return true if file is changed.
2162 CMergeDoc::FileChange CMergeDoc::IsFileChangedOnDisk(LPCTSTR szPath, DiffFileInfo &dfi,
2163 bool bSave, int nBuffer)
2165 DiffFileInfo *fileInfo = nullptr;
2166 bool bFileChanged = false;
2167 bool bIgnoreSmallDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
2169 if (bIgnoreSmallDiff)
2170 tolerance = SmallTimeDiff; // From MainFrm.h
2173 fileInfo = m_pSaveFileInfo[nBuffer].get();
2175 fileInfo = m_pRescanFileInfo[nBuffer].get();
2177 // We assume file existed, so disappearing means removal
2178 if (!dfi.Update(szPath))
2181 int64_t timeDiff = dfi.mtime - fileInfo->mtime;
2182 if (timeDiff < 0) timeDiff = -timeDiff;
2183 if ((timeDiff > tolerance * Poco::Timestamp::resolution()) || (dfi.size != fileInfo->size))
2185 bFileChanged = true;
2191 return FileNoChange;
2194 void CMergeDoc::HideLines()
2199 if (m_nDiffContext < 0)
2201 ForEachView([](auto& pView) { pView->SetEnableHideLines(false); });
2205 int nLineCount = 0x7fffffff;
2206 for (file = 0; file < m_nBuffers; file++)
2208 if (nLineCount > m_ptBuf[file]->GetLineCount())
2209 nLineCount = m_ptBuf[file]->GetLineCount();
2212 for (nLine = 0; nLine < nLineCount;)
2214 if (!(m_ptBuf[0]->GetLineFlags(nLine) & (LF_DIFF | LF_GHOST)))
2216 for (file = 0; file < m_nBuffers; file++)
2217 m_ptBuf[file]->SetLineFlag(nLine, LF_INVISIBLE, true, false, false);
2222 int nLine2 = (nLine - m_nDiffContext < 0) ? 0 : (nLine - m_nDiffContext);
2223 for (; nLine2 < nLine; nLine2++)
2225 for (file = 0; file < m_nBuffers; file++)
2226 m_ptBuf[file]->SetLineFlag(nLine2, LF_INVISIBLE, false, false, false);
2229 for (; nLine < nLineCount; nLine++)
2231 if (!(m_ptBuf[0]->GetLineFlags(nLine) & (LF_DIFF | LF_GHOST)))
2233 for (file = 0; file < m_nBuffers; file++)
2234 m_ptBuf[file]->SetLineFlag(nLine, LF_INVISIBLE, false, false, false);
2237 int nLineEnd2 = (nLine + m_nDiffContext >= nLineCount) ? nLineCount-1 : (nLine + m_nDiffContext);
2238 for (; nLine < nLineEnd2; nLine++)
2240 for (file = 0; file < m_nBuffers; file++)
2241 m_ptBuf[file]->SetLineFlag(nLine, LF_INVISIBLE, false, false, false);
2242 if (m_ptBuf[0]->GetLineFlags(nLine) & (LF_DIFF | LF_GHOST))
2243 nLineEnd2 = (nLine + 1 + m_nDiffContext >= nLineCount) ? nLineCount-1 : (nLine + 1 + m_nDiffContext);
2248 ForEachView([](auto& pView) { pView->SetEnableHideLines(true); });
2252 * @brief Asks and then saves modified files.
2254 * This function saves modified files. Dialog is shown for user to select
2255 * modified file(s) one wants to save or discard changed. Cancelling of
2256 * save operation is allowed unless denied by parameter. After successfully
2257 * save operation file statuses are updated to directory compare.
2258 * @param [in] bAllowCancel If false "Cancel" button is disabled.
2259 * @return true if user selected "OK" so next operation can be
2260 * executed. If false user choosed "Cancel".
2261 * @note If filename is empty, we assume scratchpads are saved,
2262 * so instead of filename, description is shown.
2263 * @todo If we have filename and description for file, what should
2264 * we do after saving to different filename? Empty description?
2265 * @todo Parameter @p bAllowCancel is always true in callers - can be removed.
2267 bool CMergeDoc::PromptAndSaveIfNeeded(bool bAllowCancel)
2269 bool bLModified = false, bMModified = false, bRModified = false;
2271 bool bLSaveSuccess = false, bMSaveSuccess = false, bRSaveSuccess = false;
2273 if (m_nBuffers == 3)
2275 bLModified = m_ptBuf[0]->IsModified();
2276 bMModified = m_ptBuf[1]->IsModified();
2277 bRModified = m_ptBuf[2]->IsModified();
2281 bLModified = m_ptBuf[0]->IsModified();
2282 bRModified = m_ptBuf[1]->IsModified();
2284 if (!bLModified && !bMModified && !bRModified)
2288 dlg.DoAskFor(bLModified, bMModified, bRModified);
2290 dlg.m_bDisableCancel = true;
2291 if (!m_filePaths.GetLeft().empty())
2293 if (theApp.m_strSaveAsPath.empty())
2294 dlg.m_sLeftFile = m_filePaths.GetLeft();
2296 dlg.m_sLeftFile = theApp.m_strSaveAsPath;
2299 dlg.m_sLeftFile = m_strDesc[0];
2300 if (m_nBuffers == 3)
2302 if (!m_filePaths.GetMiddle().empty())
2304 if (theApp.m_strSaveAsPath.empty())
2305 dlg.m_sMiddleFile = m_filePaths.GetMiddle();
2307 dlg.m_sMiddleFile = theApp.m_strSaveAsPath;
2310 dlg.m_sMiddleFile = m_strDesc[1];
2312 if (!m_filePaths.GetRight().empty())
2314 if (theApp.m_strSaveAsPath.empty())
2315 dlg.m_sRightFile = m_filePaths.GetRight();
2317 dlg.m_sRightFile = theApp.m_strSaveAsPath;
2320 dlg.m_sRightFile = m_strDesc[m_nBuffers - 1];
2322 if (dlg.DoModal() == IDOK)
2324 if (bLModified && dlg.m_leftSave == SaveClosingDlg::SAVECLOSING_SAVE)
2326 if (!DoSave(m_filePaths.GetLeft().c_str(), bLSaveSuccess, 0))
2330 if (bMModified && dlg.m_middleSave == SaveClosingDlg::SAVECLOSING_SAVE)
2332 if (!DoSave(m_filePaths.GetMiddle().c_str(), bMSaveSuccess, 1))
2336 if (bRModified && dlg.m_rightSave == SaveClosingDlg::SAVECLOSING_SAVE)
2338 if (!DoSave(m_filePaths.GetRight().c_str(), bRSaveSuccess, m_nBuffers - 1))
2347 // If file were modified and saving was successfull,
2348 // update status on dir view
2349 if ((bLModified && bLSaveSuccess) ||
2350 (bMModified && bMSaveSuccess) ||
2351 (bRModified && bRSaveSuccess))
2353 // If directory compare has results
2354 if (m_pDirDoc != nullptr && m_pDirDoc->HasDiffs())
2356 if (m_bEditAfterRescan[0] || m_bEditAfterRescan[1] || (m_nBuffers == 3 && m_bEditAfterRescan[2]))
2357 FlushAndRescan(false);
2359 bool bIdentical = !m_diffList.HasSignificantDiffs(); // True if status should be set to identical
2360 m_pDirDoc->UpdateChangedItem(m_filePaths, m_diffList.GetSignificantDiffs(),
2361 m_nTrivialDiffs, bIdentical);
2368 /** Rescan only if we did not Rescan during the last timeOutInSecond seconds*/
2369 void CMergeDoc::RescanIfNeeded(float timeOutInSecond)
2371 // if we did not rescan during the request timeOut, Rescan
2372 // else we did Rescan after the request, so do nothing
2373 COleDateTimeSpan elapsed = COleDateTime::GetCurrentTime() - m_LastRescan;
2374 if (elapsed.GetTotalSeconds() >= timeOutInSecond)
2375 // (laoran 08-01-2003) maybe should be FlushAndRescan(true) ??
2380 * @brief We have two child views (left & right), so we keep pointers directly
2381 * at them (the MFC view list doesn't have them both)
2383 void CMergeDoc::AddMergeViews(CMergeEditView *pView[3])
2386 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2387 m_pView[m_nGroups][nBuffer] = pView[nBuffer];
2391 void CMergeDoc::RemoveMergeViews(int nGroup)
2394 for (; nGroup < m_nGroups - 1; nGroup++)
2396 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2398 m_pView[nGroup][nBuffer] = m_pView[nGroup + 1][nBuffer];
2399 m_pView[nGroup][nBuffer]->m_nThisGroup = nGroup;
2406 * @brief DirDoc gives us its identity just after it creates us
2408 void CMergeDoc::SetDirDoc(CDirDoc * pDirDoc)
2410 ASSERT(pDirDoc != nullptr && m_pDirDoc == nullptr);
2411 m_pDirDoc = pDirDoc;
2415 * @brief Return pointer to parent frame
2417 CMergeEditFrame * CMergeDoc::GetParentFrame()
2419 return dynamic_cast<CMergeEditFrame *>(m_pView[0][0]->GetParentFrame());
2423 * @brief DirDoc is closing
2425 void CMergeDoc::DirDocClosing(CDirDoc * pDirDoc)
2427 ASSERT(m_pDirDoc == pDirDoc);
2428 m_pDirDoc = nullptr;
2429 // TODO (Perry 2003-03-30): perhaps merge doc should close now ?
2433 * @brief DirDoc commanding us to close
2435 bool CMergeDoc::CloseNow()
2437 // Allow user to cancel closing
2438 if (!PromptAndSaveIfNeeded(true))
2441 GetParentFrame()->CloseNow();
2446 * @brief Loads file to buffer and shows load-errors
2447 * @param [in] sFileName File to open
2448 * @param [in] nBuffer Index (0-based) of buffer to load
2449 * @param [out] readOnly whether file is read-only
2450 * @param [in] encoding encoding used
2451 * @return Tells if files were loaded successfully
2452 * @sa CMergeDoc::OpenDocs()
2454 int CMergeDoc::LoadFile(CString sFileName, int nBuffer, bool & readOnly, const FileTextEncoding & encoding)
2457 DWORD retVal = FileLoadResult::FRESULT_ERROR;
2459 CDiffTextBuffer *pBuf = m_ptBuf[nBuffer].get();
2460 m_filePaths[nBuffer] = sFileName;
2462 CRLFSTYLE nCrlfStyle = CRLF_STYLE_AUTOMATIC;
2464 retVal = pBuf->LoadFromFile(sFileName, m_pInfoUnpacker.get(),
2465 m_strBothFilenames.c_str(), readOnly, nCrlfStyle, encoding, sOpenError);
2467 // if CMergeDoc::CDiffTextBuffer::LoadFromFile failed,
2468 // it left the pBuf in a valid (but empty) state via a call to InitNew
2470 if (FileLoadResult::IsOkImpure(retVal))
2472 // File loaded, and multiple EOL types in this file
2473 FileLoadResult::SetMainOk(retVal);
2475 // If mixed EOLs are not enabled, enable them for this doc.
2476 if (!GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL))
2478 pBuf->SetMixedEOL(true);
2482 if (FileLoadResult::IsError(retVal))
2484 // Error from Unifile/system
2485 if (!sOpenError.IsEmpty())
2486 sError = strutils::format_string2(_("Cannot open file\n%1\n\n%2"), (LPCTSTR)sFileName, (LPCTSTR)sOpenError);
2488 sError = strutils::format_string1(_("File not found: %1"), (LPCTSTR)sFileName);
2489 ShowMessageBox(sError, MB_OK | MB_ICONSTOP | MB_MODELESS);
2491 else if (FileLoadResult::IsErrorUnpack(retVal))
2493 sError = strutils::format_string1(_("File not unpacked: %1"), (LPCTSTR)sFileName);
2494 ShowMessageBox(sError, MB_OK | MB_ICONSTOP | MB_MODELESS);
2500 * @brief Check if specified codepage number is valid for WinMerge Editor.
2501 * @param [in] cp Codepage number to check.
2502 * @return true if codepage is valid, false otherwise.
2504 bool CMergeDoc::IsValidCodepageForMergeEditor(unsigned cp) const
2506 if (cp == 0) // 0 is our signal value for invalid
2508 return GetEncodingNameFromCodePage(cp) != nullptr;
2512 * @brief Sanity check file's specified codepage.
2513 * This function checks if file's specified codepage is valid for WinMerge
2514 * editor and if not resets the codepage to default.
2515 * @param [in,out] fileinfo Class containing file's codepage.
2517 void CMergeDoc::SanityCheckCodepage(FileLocation & fileinfo)
2519 if (fileinfo.encoding.m_unicoding == ucr::NONE
2520 && !IsValidCodepageForMergeEditor(fileinfo.encoding.m_codepage))
2522 int cp = ucr::getDefaultCodepage();
2523 if (!IsValidCodepageForMergeEditor(cp))
2525 fileinfo.encoding.SetCodepage(cp);
2530 * @brief Loads one file from disk and updates file infos.
2531 * @param [in] index Index of file in internal buffers.
2532 * @param [in] filename File's name.
2533 * @param [in] readOnly Is file read-only?
2534 * @param [in] encoding File's encoding.
2535 * @return One of FileLoadResult values.
2537 DWORD CMergeDoc::LoadOneFile(int index, String filename, bool readOnly, const String& strDesc,
2538 const FileTextEncoding & encoding)
2540 DWORD loadSuccess = FileLoadResult::FRESULT_ERROR;;
2542 m_strDesc[index] = strDesc;
2543 if (!filename.empty())
2545 if (strDesc.empty())
2546 m_nBufferType[index] = BUFFER_NORMAL;
2548 m_nBufferType[index] = BUFFER_NORMAL_NAMED;
2549 m_pSaveFileInfo[index]->Update(filename);
2550 m_pRescanFileInfo[index]->Update(filename);
2552 loadSuccess = LoadFile(filename.c_str(), index, readOnly, encoding);
2553 if (FileLoadResult::IsLossy(loadSuccess))
2555 m_ptBuf[index]->FreeAll();
2556 loadSuccess = LoadFile(filename.c_str(), index, readOnly,
2557 GuessCodepageEncoding(filename, GetOptionsMgr()->GetInt(OPT_CP_DETECT), -1));
2562 m_nBufferType[index] = BUFFER_UNNAMED;
2563 m_ptBuf[index]->InitNew();
2564 m_ptBuf[index]->m_encoding = encoding;
2565 m_ptBuf[index]->FinishLoading(); // should clear GGhostTextBuffer::m_RealityBlock when reloading unnamed buffer
2566 loadSuccess = FileLoadResult::FRESULT_OK;
2572 * @brief Loads files and does initial rescan.
2573 * @param fileloc [in] File to open to left/middle/right side (path & encoding info)
2574 * @param bRO [in] Is left/middle/right file read-only
2575 * @return Success/Failure/Binary (failure) per typedef enum OpenDocsResult_TYPE
2576 * @todo Options are still read from CMainFrame, this will change
2577 * @sa CMainFrame::ShowMergeDoc()
2579 bool CMergeDoc::OpenDocs(int nFiles, const FileLocation ifileloc[],
2580 const bool bRO[], const String strDesc[])
2582 IDENTLEVEL identical = IDENTLEVEL_NONE;
2583 int nRescanResult = RESCAN_OK;
2585 FileLocation fileloc[3];
2587 std::copy_n(ifileloc, 3, fileloc);
2589 // Filter out invalid codepages, or editor will display all blank
2590 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2591 SanityCheckCodepage(fileloc[nBuffer]);
2595 curUndo = undoTgt.begin();
2597 // Prevent displaying views during LoadFile
2598 // Note : attach buffer again only if both loads succeed
2599 m_strBothFilenames.erase();
2601 ForEachView([](auto& pView) { pView->DetachFromBuffer(); });
2603 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2605 // clear undo buffers
2606 m_ptBuf[nBuffer]->m_aUndoBuf.clear();
2609 m_ptBuf[nBuffer]->FreeAll ();
2611 // build the text being filtered, "|" separates files as it is forbidden in filenames
2612 m_strBothFilenames += fileloc[nBuffer].filepath + _T("|");
2614 m_strBothFilenames.erase(m_strBothFilenames.length() - 1);
2618 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2620 nSuccess[nBuffer] = LoadOneFile(nBuffer, fileloc[nBuffer].filepath, bRO[nBuffer], strDesc ? strDesc[nBuffer] : _T(""),
2621 fileloc[nBuffer].encoding);
2623 const bool bFiltersEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
2625 // scratchpad : we don't call LoadFile, so
2626 // we need to initialize the unpacker as a "do nothing" one
2627 if (bFiltersEnabled)
2629 if (std::count(m_nBufferType, m_nBufferType + m_nBuffers, BUFFER_UNNAMED) == m_nBuffers)
2631 m_pInfoUnpacker->Initialize(PLUGIN_MANUAL);
2635 // Bail out if either side failed
2636 if (std::find_if(nSuccess, nSuccess + m_nBuffers, [](DWORD d){return !FileLoadResult::IsOk(d);} ) != nSuccess + m_nBuffers)
2638 CMergeEditFrame *pFrame = GetParentFrame();
2639 if (pFrame != nullptr)
2641 // Use verify macro to trap possible error in debug.
2642 VERIFY(pFrame->DestroyWindow());
2647 // Warn user if file load was lossy (bad encoding)
2649 int nLossyBuffers = 0;
2650 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2652 if (FileLoadResult::IsLossy(nSuccess[nBuffer]))
2654 // TODO: It would be nice to report how many lines were lossy
2655 // we did calculate those numbers when we loaded the files, in the text stats
2657 idres = IDS_LOSSY_TRANSCODING_FIRST + nBuffer;
2661 if (nLossyBuffers > 1)
2662 idres = IDS_LOSSY_TRANSCODING_BOTH; /* FIXEME */
2664 if (nLossyBuffers > 0)
2666 if (m_pEncodingErrorBar == nullptr)
2668 m_pEncodingErrorBar.reset(new CEncodingErrorBar());
2669 m_pEncodingErrorBar->Create(this->m_pView[0][0]->GetParentFrame());
2671 m_pEncodingErrorBar->SetText(LoadResString(idres));
2672 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), TRUE, FALSE);
2675 ForEachView([](auto& pView) {
2676 // Now buffers data are valid
2677 pView->AttachToBuffer();
2678 // Currently there is only one set of syntax colors, which all documents & views share
2679 pView->SetColorContext(theApp.GetMainSyntaxColors());
2680 // Currently there is only one set of markers, which all documents & views share
2681 pView->SetMarkersContext(theApp.GetMainMarkers());
2683 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2685 // Set read-only statuses
2686 m_ptBuf[nBuffer]->SetReadOnly(bRO[nBuffer]);
2689 // Check the EOL sensitivity option (do it before Rescan)
2690 DIFFOPTIONS diffOptions = {0};
2691 m_diffWrapper.GetOptions(&diffOptions);
2692 if (!GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) && !diffOptions.bIgnoreEol)
2694 for (nBuffer = 1; nBuffer < m_nBuffers; nBuffer++)
2695 if (m_ptBuf[0]->GetCRLFMode() != m_ptBuf[nBuffer]->GetCRLFMode())
2698 if (nBuffer < m_nBuffers)
2700 // Options and files not are not compatible :
2701 // Sensitive to EOL on, allow mixing EOL off, and files have a different EOL style.
2702 // All lines will differ, that is not very interesting and probably not wanted.
2703 // Propose to turn off the option 'sensitive to EOL'
2704 String s = theApp.LoadString(IDS_SUGGEST_IGNOREEOL);
2705 if (ShowMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN | MB_IGNORE_IF_SILENCED, IDS_SUGGEST_IGNOREEOL) == IDYES)
2707 diffOptions.bIgnoreEol = true;
2708 m_diffWrapper.SetOptions(&diffOptions);
2713 // Define the prediffer
2714 PackingInfo * infoUnpacker = nullptr;
2715 PrediffingInfo * infoPrediffer = nullptr;
2716 if (bFiltersEnabled && m_pDirDoc != nullptr)
2718 m_pDirDoc->GetPluginManager().FetchPluginInfos(m_strBothFilenames, &infoUnpacker, &infoPrediffer);
2719 m_diffWrapper.SetPrediffer(infoPrediffer);
2720 m_diffWrapper.SetTextForAutomaticPrediff(m_strBothFilenames);
2723 bool bBinary = false;
2724 nRescanResult = Rescan(bBinary, identical);
2726 // Open filed if rescan succeed and files are not binaries
2727 if (nRescanResult == RESCAN_OK)
2729 // set the document types
2730 // Warning : it is the first thing to do (must be done before UpdateView,
2731 // or any function that calls UpdateView, like SelectDiff)
2732 // Note: If option enabled, and another side type is not recognized,
2733 // we use recognized type for unrecognized side too.
2738 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2740 if (bFiltersEnabled && m_pInfoUnpacker->m_textType.length())
2741 sext[nBuffer] = m_pInfoUnpacker->m_textType;
2743 sext[nBuffer] = GetFileExt(fileloc[nBuffer].filepath.c_str(), m_strDesc[nBuffer].c_str());
2744 ForEachView(nBuffer, [&](auto& pView) {
2745 bTyped[nBuffer] = pView->SetTextType(sext[nBuffer].c_str());
2746 if (bTyped[nBuffer])
2747 paneTyped = nBuffer;
2751 for (nBuffer = 1; nBuffer < m_nBuffers; nBuffer++)
2753 if (bTyped[0] != bTyped[nBuffer])
2757 bool syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
2758 if (syntaxHLEnabled && nBuffer < m_nBuffers)
2760 if (std::count(bTyped, bTyped + m_nBuffers, false) == m_nBuffers)
2763 m_ptBuf[0]->GetLine(0, sFirstLine);
2764 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2766 bTyped[nBuffer] = GetView(0, nBuffer)->SetTextTypeByContent(sFirstLine);
2771 if (syntaxHLEnabled)
2773 CCrystalTextView::TextDefinition *enuType = GetView(0, paneTyped)->GetTextType(sext[paneTyped].c_str());
2774 ForEachView([&bTyped, enuType](auto& pView) {
2775 if (!bTyped[pView->m_nThisPane])
2776 pView->SetTextType(enuType);
2780 int nNormalBuffer = 0;
2781 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2783 // set the frame window header
2784 UpdateHeaderPath(nBuffer);
2786 ForEachView(nBuffer, [](auto& pView) { pView->DocumentsLoaded(); });
2788 if ((m_nBufferType[nBuffer] == BUFFER_NORMAL) ||
2789 (m_nBufferType[nBuffer] == BUFFER_NORMAL_NAMED))
2796 // Inform user that files are identical
2797 // Don't show message if new buffers created
2798 if (identical == IDENTLEVEL_ALL && nNormalBuffer > 0)
2800 ShowRescanError(nRescanResult, identical);
2803 // Exit if files are identical should only work for the first
2804 // comparison and must be disabled afterward.
2805 theApp.m_bExitIfNoDiff = MergeCmdLineInfo::Disabled;
2809 // CMergeDoc::Rescan fails if files do not exist on both sides
2810 // or the really arcane case that the temp files couldn't be created,
2811 // which is too obscure to bother reporting if you can't write to
2812 // your temp directory, doing nothing is graceful enough for that).
2813 ShowRescanError(nRescanResult, identical);
2814 GetParentFrame()->DestroyWindow();
2818 // Force repaint of location pane to update it in case we had some warning
2819 // dialog visible and it got painted before files were loaded
2820 if (m_pView[0][0] != nullptr)
2821 m_pView[0][0]->RepaintLocationPane();
2826 void CMergeDoc::MoveOnLoad(int nPane, int nLineIndex)
2830 nPane = GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE);
2831 if (nPane < 0 || nPane >= m_nBuffers)
2834 if (nLineIndex == -1)
2836 // scroll to first diff
2837 if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST) &&
2838 m_diffList.HasSignificantDiffs())
2840 int nDiff = m_diffList.FirstSignificantDiff();
2841 m_pView[0][nPane]->SelectDiff(nDiff, true, false);
2842 nLineIndex = m_pView[0][nPane]->GetCursorPos().y;
2845 m_pView[0][nPane]->GotoLine(nLineIndex < 0 ? 0 : nLineIndex, false, nPane);
2848 void CMergeDoc::ChangeFile(int nBuffer, const String& path)
2850 if (!PromptAndSaveIfNeeded(true))
2853 FileLocation fileloc[3];
2856 for (int pane = 0; pane < m_nBuffers; pane++)
2858 bRO[pane] = m_ptBuf[pane]->GetReadOnly();
2859 fileloc[pane].encoding.m_unicoding = m_ptBuf[pane]->getUnicoding();
2860 fileloc[pane].encoding.m_codepage = m_ptBuf[pane]->getCodepage();
2861 fileloc[pane].setPath(m_filePaths[pane]);
2863 std::copy_n(m_strDesc, m_nBuffers, strDesc);
2865 strDesc[nBuffer] = _T("");
2866 fileloc[nBuffer].setPath(path);
2867 fileloc[nBuffer].encoding = GuessCodepageEncoding(path, GetOptionsMgr()->GetInt(OPT_CP_DETECT));
2869 OpenDocs(m_nBuffers, fileloc, bRO, strDesc);
2870 MoveOnLoad(nBuffer, 0);
2874 * @brief Re-load a document.
2875 * This methods re-loads the file compare document. The re-loaded document is
2876 * one side of the file compare.
2877 * @param [in] index The document to re-load.
2878 * @return Open result code.
2880 void CMergeDoc::RefreshOptions()
2882 DIFFOPTIONS options = {0};
2884 m_diffWrapper.SetDetectMovedBlocks(GetOptionsMgr()->GetBool(OPT_CMP_MOVED_BLOCKS));
2885 Options::DiffOptions::Load(GetOptionsMgr(), options);
2887 m_diffWrapper.SetOptions(&options);
2889 // Refresh view options
2890 ForEachView([](auto& pView) { pView->RefreshOptions(); });
2894 * @brief Write path and filename to headerbar
2895 * @note SetText() does not repaint unchanged text
2897 void CMergeDoc::UpdateHeaderPath(int pane)
2899 CMergeEditFrame *pf = GetParentFrame();
2900 ASSERT(pf != nullptr);
2902 bool bChanges = false;
2904 if (m_nBufferType[pane] == BUFFER_UNNAMED ||
2905 m_nBufferType[pane] == BUFFER_NORMAL_NAMED)
2907 sText = m_strDesc[pane];
2911 sText = m_filePaths[pane];
2912 if (m_pDirDoc != nullptr)
2914 m_pDirDoc->ApplyDisplayRoot(pane, sText);
2917 bChanges = m_ptBuf[pane]->IsModified();
2920 sText.insert(0, _T("* "));
2922 pf->GetHeaderInterface()->SetText(pane, sText);
2928 * @brief Paint differently the headerbar of the active view
2930 void CMergeDoc::UpdateHeaderActivity(int pane, bool bActivate)
2932 CMergeEditFrame *pf = GetParentFrame();
2933 ASSERT(pf != nullptr);
2934 pf->GetHeaderInterface()->SetActive(pane, bActivate);
2938 * @brief Set detect/not detect Moved Blocks
2940 void CMergeDoc::SetDetectMovedBlocks(bool bDetectMovedBlocks)
2942 if (bDetectMovedBlocks == m_diffWrapper.GetDetectMovedBlocks())
2945 GetOptionsMgr()->SaveOption(OPT_CMP_MOVED_BLOCKS, bDetectMovedBlocks);
2946 m_diffWrapper.SetDetectMovedBlocks(bDetectMovedBlocks);
2951 * @brief Check if given buffer has mixed EOL style.
2952 * @param [in] nBuffer Buffer to check.
2953 * @return true if buffer's EOL style is mixed, false otherwise.
2955 bool CMergeDoc::IsMixedEOL(int nBuffer) const
2957 CDiffTextBuffer *pBuf = m_ptBuf[nBuffer].get();
2958 return pBuf->IsMixedEOL();
2961 void CMergeDoc::SetEditedAfterRescan(int nBuffer)
2963 m_bEditAfterRescan[nBuffer] = true;
2967 * @brief Update document filenames to title
2969 void CMergeDoc::SetTitle(LPCTSTR lpszTitle)
2972 String sFileName[3];
2974 if (lpszTitle != nullptr)
2978 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2979 sFileName[nBuffer] = !m_strDesc[nBuffer].empty() ? m_strDesc[nBuffer] : paths::FindFileName(m_filePaths[nBuffer]);
2980 if (std::count(&sFileName[0], &sFileName[0] + m_nBuffers, sFileName[0]) == m_nBuffers)
2981 sTitle = sFileName[0] + strutils::format(_T(" x %d"), m_nBuffers);
2983 sTitle = strutils::join(&sFileName[0], &sFileName[0] + m_nBuffers, _T(" - "));
2985 CDocument::SetTitle(sTitle.c_str());
2989 * @brief Update any resources necessary after a GUI language change
2991 void CMergeDoc::UpdateResources()
2996 m_strDesc[0] = _("Untitled left");
2997 m_strDesc[m_nBuffers - 1] = _("Untitled right");
2998 if (m_nBuffers == 3)
2999 m_strDesc[1] = _("Untitled middle");
3000 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3001 UpdateHeaderPath(nBuffer);
3003 GetParentFrame()->UpdateResources();
3004 ForEachView([](auto& pView) { pView->UpdateResources(); });
3007 // Return current word breaking break type setting (whitespace only or include punctuation)
3008 bool CMergeDoc::GetBreakType() const
3010 bool breakType = !!GetOptionsMgr()->GetInt(OPT_BREAK_TYPE);
3014 // Return true to do line diff colors at the byte level (false to do them at word level)
3015 bool CMergeDoc::GetByteColoringOption() const
3017 // color at byte level if 'break_on_words' option not set
3018 bool breakWords = GetOptionsMgr()->GetBool(OPT_BREAK_ON_WORDS);
3022 /// Swap files and update views
3023 void CMergeDoc::SwapFiles()
3026 for (int nGroup = 0; nGroup < m_nGroups; ++nGroup)
3028 int nLeftViewId = m_pView[nGroup][0]->GetDlgCtrlID();
3029 int nRightViewId = m_pView[nGroup][m_nBuffers - 1]->GetDlgCtrlID();
3030 m_pView[nGroup][0]->SetDlgCtrlID(nRightViewId);
3031 m_pView[nGroup][m_nBuffers - 1]->SetDlgCtrlID(nLeftViewId);
3035 // Swap buffers and so on
3036 std::swap(m_ptBuf[0], m_ptBuf[m_nBuffers - 1]);
3037 for (int nGroup = 0; nGroup < m_nGroups; ++nGroup)
3038 std::swap(m_pView[nGroup][0], m_pView[nGroup][m_nBuffers - 1]);
3039 std::swap(m_pSaveFileInfo[0], m_pSaveFileInfo[m_nBuffers - 1]);
3040 std::swap(m_pRescanFileInfo[0], m_pRescanFileInfo[m_nBuffers - 1]);
3041 std::swap(m_nBufferType[0], m_nBufferType[m_nBuffers - 1]);
3042 std::swap(m_bEditAfterRescan[0], m_bEditAfterRescan[m_nBuffers - 1]);
3043 std::swap(m_strDesc[0], m_strDesc[m_nBuffers - 1]);
3046 m_diffList.Swap(0, m_nBuffers - 1);
3047 for (int nGroup = 0; nGroup < m_nGroups; nGroup++)
3048 swap(m_pView[nGroup][0]->m_piMergeEditStatus, m_pView[nGroup][m_nBuffers - 1]->m_piMergeEditStatus);
3050 ClearWordDiffCache();
3052 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3054 m_ptBuf[nBuffer]->m_nThisPane = nBuffer;
3055 for (int nGroup = 0; nGroup < m_nGroups; nGroup++)
3056 m_pView[nGroup][nBuffer]->m_nThisPane = nBuffer;
3059 UpdateHeaderPath(nBuffer);
3061 GetParentFrame()->UpdateSplitter();
3062 ForEachView([](auto& pView) { pView->UpdateStatusbar(); });
3064 UpdateAllViews(nullptr);
3068 * @brief Display unpacker dialog to user & handle user's choices
3070 bool CMergeDoc::OpenWithUnpackerDialog()
3072 // let the user choose a handler
3073 CSelectUnpackerDlg dlg(m_filePaths[0], nullptr);
3074 // create now a new infoUnpacker to initialize the manual/automatic flag
3075 PackingInfo infoUnpacker(PLUGIN_AUTO);
3076 dlg.SetInitialInfoHandler(&infoUnpacker);
3078 if (dlg.DoModal() == IDOK)
3080 infoUnpacker = dlg.GetInfoHandler();
3081 Merge7zFormatMergePluginScope scope(&infoUnpacker);
3082 if (HasZipSupport() && std::count_if(m_filePaths.begin(), m_filePaths.end(), ArchiveGuessFormat) == m_nBuffers)
3084 DWORD dwFlags[3] = {FFILEOPEN_NOMRU, FFILEOPEN_NOMRU, FFILEOPEN_NOMRU};
3085 GetMainFrame()->DoFileOpen(&m_filePaths, dwFlags, m_strDesc, _T(""),
3086 GetOptionsMgr()->GetBool(OPT_CMP_INCLUDE_SUBDIRS), nullptr, _T(""), &infoUnpacker);
3091 SetUnpacker(&infoUnpacker);
3103 * @brief Reloads the opened files
3105 void CMergeDoc::OnFileReload()
3107 if (!PromptAndSaveIfNeeded(true))
3110 FileLocation fileloc[3];
3112 for (int pane = 0; pane < m_nBuffers; pane++)
3114 bRO[pane] = m_ptBuf[pane]->GetReadOnly();
3115 fileloc[pane].encoding.m_unicoding = m_ptBuf[pane]->getUnicoding();
3116 fileloc[pane].encoding.m_codepage = m_ptBuf[pane]->getCodepage();
3117 fileloc[pane].setPath(m_filePaths[pane]);
3119 CPoint pt = GetActiveMergeView()->GetCursorPos();
3120 OpenDocs(m_nBuffers, fileloc, bRO, m_strDesc);
3121 MoveOnLoad(GetActiveMergeView()->m_nThisPane, pt.y);
3125 * @brief Display encodings to user
3127 void CMergeDoc::OnFileEncoding()
3129 DoFileEncodingDialog();
3132 void CMergeDoc::OnCtxtOpenWithUnpacker()
3134 OpenWithUnpackerDialog();
3137 void CMergeDoc::OnBnClickedFileEncoding()
3139 if (m_pEncodingErrorBar == nullptr || m_pView[0][0] == nullptr)
3141 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), FALSE, FALSE);
3142 DoFileEncodingDialog();
3145 void CMergeDoc::OnBnClickedPlugin()
3147 if (m_pEncodingErrorBar == nullptr || m_pView[0][0] == nullptr)
3149 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), FALSE, FALSE);
3150 OpenWithUnpackerDialog();
3153 void CMergeDoc::OnBnClickedHexView()
3155 OnFileRecompareAs(ID_MERGE_COMPARE_HEX);
3158 void CMergeDoc::OnOK()
3160 if (m_pEncodingErrorBar == nullptr || m_pView[0][0] == nullptr)
3162 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), FALSE, FALSE);
3165 void CMergeDoc::OnFileRecompareAsText()
3167 PackingInfo infoUnpacker;
3168 SetUnpacker(&infoUnpacker);
3172 void CMergeDoc::OnUpdateFileRecompareAsText(CCmdUI *pCmdUI)
3174 pCmdUI->Enable(m_pInfoUnpacker->m_PluginOrPredifferMode == PLUGIN_BUILTIN_XML);
3177 void CMergeDoc::OnFileRecompareAsXML()
3179 PackingInfo infoUnpacker(PLUGIN_BUILTIN_XML);
3180 SetUnpacker(&infoUnpacker);
3184 void CMergeDoc::OnUpdateFileRecompareAsXML(CCmdUI *pCmdUI)
3186 pCmdUI->Enable(m_pInfoUnpacker->m_PluginOrPredifferMode != PLUGIN_BUILTIN_XML);
3189 void CMergeDoc::OnFileRecompareAs(UINT nID)
3191 DWORD dwFlags[3] = { 0 };
3192 FileLocation fileloc[3];
3193 for (int pane = 0; pane < m_nBuffers; pane++)
3195 fileloc[pane].setPath(m_filePaths[pane]);
3196 dwFlags[pane] |= FFILEOPEN_NOMRU | (m_ptBuf[pane]->GetReadOnly() ? FFILEOPEN_READONLY : 0);
3198 if (m_pEncodingErrorBar!=nullptr && m_pEncodingErrorBar->IsWindowVisible())
3199 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), FALSE, FALSE);
3200 if (nID == ID_MERGE_COMPARE_HEX)
3201 GetMainFrame()->ShowHexMergeDoc(m_pDirDoc, m_nBuffers, fileloc, dwFlags, m_strDesc);
3203 GetMainFrame()->ShowImgMergeDoc(m_pDirDoc, m_nBuffers, fileloc, dwFlags, m_strDesc);
3204 GetParentFrame()->ShowWindow(SW_RESTORE);
3205 GetParentFrame()->DestroyWindow();
3208 // Return file extension either from file name
3209 String CMergeDoc::GetFileExt(LPCTSTR sFileName, LPCTSTR sDescription) const
3212 paths::SplitFilename(sFileName, nullptr, nullptr, &sExt);
3217 * @brief Generate report from file compare results.
3219 bool CMergeDoc::GenerateReport(const String& sFileName) const
3221 // calculate HTML font size
3224 dc.CreateDC(_T("DISPLAY"), nullptr, nullptr, nullptr);
3225 m_pView[0][0]->GetFont(lf);
3226 int nFontSize = -MulDiv (lf.lfHeight, 72, dc.GetDeviceCaps (LOGPIXELSY));
3228 // create HTML report
3230 if (!file.Open(sFileName, _T("wt")))
3232 String errMsg = GetSysError(GetLastError());
3233 String msg = strutils::format_string1(
3234 _("Error creating the report:\n%1"), errMsg);
3235 AfxMessageBox(msg.c_str(), MB_OK | MB_ICONSTOP);
3239 file.SetCodepage(ucr::CP_UTF_8);
3241 CString headerText =
3242 _T("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n")
3243 _T("\t\"http://www.w3.org/TR/html4/loose.dtd\">\n")
3246 _T("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n")
3247 _T("<title>WinMerge File Compare Report</title>\n")
3248 _T("<style type=\"text/css\">\n")
3250 _T("table {margin: 0; border: 1px solid #a0a0a0; box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.15);}\n")
3251 _T("td,th {word-break: break-all; font-size: %dpt;padding: 0 3px;}\n")
3252 _T("tr { vertical-align: top; }\n")
3253 _T(".ln {text-align: right; word-break: normal; background-color: lightgrey;}\n")
3254 _T(".title {color: white; background-color: blue; vertical-align: top; padding: 4px 4px; background: linear-gradient(mediumblue, darkblue);}\n")
3260 _T("<table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%%;\">\n")
3264 strutils::format((LPCTSTR)headerText, nFontSize, (LPCTSTR)m_pView[0][0]->GetHTMLStyles());
3265 file.WriteString(header);
3268 // If archive, use archive path + folder + filename inside archive
3269 // If desc text given, use it
3270 PathContext paths = m_filePaths;
3271 if (m_pDirDoc != nullptr && m_pDirDoc->IsArchiveFolders())
3273 for (int i = 0; i < paths.GetSize(); i++)
3274 m_pDirDoc->ApplyDisplayRoot(i, paths[i]);
3278 for (int i = 0; i < paths.GetSize(); i++)
3280 if (!m_strDesc[i].empty())
3281 paths[i] = m_strDesc[i];
3287 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3289 String data = strutils::format(_T("<th colspan=\"2\" class=\"title\" style=\"width:%f%%\">"),
3290 (double)100 / m_nBuffers);
3291 file.WriteString(data);
3292 file.WriteString(ucr::toTString(CMarkdown::Entities(ucr::toUTF8(paths[nBuffer]))));
3293 file.WriteString(_T("</th>\n"));
3300 // write the body of the report
3302 int nLineCount[3] = {0};
3304 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3305 nLineCount[nBuffer] = m_ptBuf[nBuffer]->GetLineCount();
3309 file.WriteString(_T("<tr>\n"));
3310 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3312 for (; idx[nBuffer] < nLineCount[nBuffer]; idx[nBuffer]++)
3314 if (m_pView[0][nBuffer]->GetLineVisible(idx[nBuffer]))
3318 if (idx[nBuffer] < nLineCount[nBuffer])
3321 int iVisibleLineNumber = 0;
3322 String tdtag = _T("<td class=\"ln\">");
3323 DWORD dwFlags = m_ptBuf[nBuffer]->GetLineFlags(idx[nBuffer]);
3324 if ((dwFlags & LF_GHOST) == 0 && m_pView[0][nBuffer]->GetViewLineNumbers())
3326 iVisibleLineNumber = m_ptBuf[nBuffer]->ComputeRealLine(idx[nBuffer]) + 1;
3329 (dwFlags & (LF_DIFF | LF_GHOST)) != 0 && (idx[nBuffer] == 0 ||
3330 (m_ptBuf[nBuffer]->GetLineFlags(idx[nBuffer] - 1) & (LF_DIFF | LF_GHOST)) == 0))
3333 if (iVisibleLineNumber > 0)
3335 tdtag += strutils::format(_T("<a name=\"d%d\" href=\"#d%d\">%d</a>"), nDiff, nDiff, iVisibleLineNumber);
3336 iVisibleLineNumber = 0;
3339 tdtag += strutils::format(_T("<a name=\"d%d\" href=\"#d%d\">.</a>"), nDiff, nDiff);
3341 if (iVisibleLineNumber > 0)
3342 tdtag += strutils::format(_T("%d</td>"), iVisibleLineNumber);
3344 tdtag += _T("</td>");
3345 file.WriteString(tdtag);
3347 file.WriteString((LPCTSTR)m_pView[0][nBuffer]->GetHTMLLine(idx[nBuffer], _T("td")));
3351 file.WriteString(_T("<td class=\"ln\"></td><td></td>"));
3352 file.WriteString(_T("\n"));
3354 file.WriteString(_T("</tr>\n"));
3356 bool bBorderLine = false;
3357 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3359 if (idx[nBuffer] < nLineCount[nBuffer] && !m_pView[0][nBuffer]->GetLineVisible(idx[nBuffer]))
3365 file.WriteString(_T("<tr height=1>"));
3366 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3368 if (idx[nBuffer] < nLineCount[nBuffer] && !m_pView[0][nBuffer]->GetLineVisible(idx[nBuffer]))
3369 file.WriteString(_T("<td style=\"background-color: black\"></td><td style=\"background-color: black\"></td>"));
3371 file.WriteString(_T("<td></td><td></td>"));
3373 file.WriteString(_T("</tr>\n"));
3376 if (idx[0] >= nLineCount[0] && idx[1] >= nLineCount[1] && (m_nBuffers < 3 || idx[2] >= nLineCount[2]))
3391 * @brief Generate report from file compare results.
3393 void CMergeDoc::OnToolsGenerateReport()
3398 if (!SelectFile(AfxGetMainWnd()->GetSafeHwnd(), s, false, folder, _T(""), _("HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"), _T("htm")))
3401 GenerateReport(s.c_str());
3403 LangMessageBox(IDS_REPORT_SUCCESS, MB_OK | MB_ICONINFORMATION);
3407 * @brief Generate patch from files selected.
3409 * Creates a patch from selected files in active directory compare, or
3410 * active file compare. Files in file compare must be saved before
3413 void CMergeDoc::OnToolsGeneratePatch()
3415 // If there are changes in files, tell user to save them first
3418 LangMessageBox(IDS_SAVEFILES_FORPATCH, MB_ICONSTOP);
3423 patcher.AddFiles(m_filePaths.GetLeft(),
3424 m_filePaths.GetRight());
3425 patcher.CreatePatch();
3429 * @brief Add synchronization point
3431 void CMergeDoc::AddSyncPoint()
3434 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3436 int tmp = m_pView[0][nBuffer]->GetCursorPos().y;
3437 nLine[nBuffer] = m_ptBuf[nBuffer]->ComputeApparentLine(m_ptBuf[nBuffer]->ComputeRealLine(tmp));
3439 if (m_ptBuf[nBuffer]->GetLineFlags(nLine[nBuffer]) & LF_INVALID_BREAKPOINT)
3440 DeleteSyncPoint(nBuffer, nLine[nBuffer], false);
3443 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3444 m_ptBuf[nBuffer]->SetLineFlag(nLine[nBuffer], LF_INVALID_BREAKPOINT, true, false);
3446 m_bHasSyncPoints = true;
3448 ForEachView([](auto& pView) { pView->SetSelectionMargin(true); });
3450 FlushAndRescan(true);
3454 * @brief Delete a synchronization point
3456 bool CMergeDoc::DeleteSyncPoint(int pane, int nLine, bool bRescan)
3458 const auto syncpoints = GetSyncPointList();
3459 for (auto syncpnt : syncpoints)
3461 if (syncpnt[pane] == nLine)
3463 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3464 m_ptBuf[nBuffer]->SetLineFlag(syncpnt[nBuffer], LF_INVALID_BREAKPOINT, false, false);
3468 if (syncpoints.size() == 1)
3469 m_bHasSyncPoints = false;
3472 FlushAndRescan(true);
3477 * @brief Clear Synchronization points
3479 void CMergeDoc::ClearSyncPoints()
3481 if (!m_bHasSyncPoints)
3484 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3486 int nLineCount = m_ptBuf[nBuffer]->GetLineCount();
3487 for (int nLine = 0; nLine < nLineCount; ++nLine)
3489 if (m_ptBuf[nBuffer]->GetLineFlags(nLine) & LF_INVALID_BREAKPOINT)
3490 m_ptBuf[nBuffer]->SetLineFlag(nLine, LF_INVALID_BREAKPOINT, false, false);
3494 m_bHasSyncPoints = false;
3496 FlushAndRescan(true);
3499 std::vector<std::vector<int> > CMergeDoc::GetSyncPointList()
3501 std::vector<std::vector<int> > list;
3502 if (!m_bHasSyncPoints)
3504 int idx[3] = {-1, -1, -1};
3505 std::vector<int> points(m_nBuffers);
3506 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3507 points[nBuffer] = m_ptBuf[nBuffer]->GetLineCount() - 1;
3508 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3510 int nLineCount = m_ptBuf[nBuffer]->GetLineCount();
3511 for (int nLine = 0; nLine < nLineCount; ++nLine)
3513 if (m_ptBuf[nBuffer]->GetLineFlags(nLine) & LF_INVALID_BREAKPOINT)
3516 if (static_cast<int>(list.size()) <= idx[nBuffer])
3517 list.push_back(points);
3518 list[idx[nBuffer]][nBuffer] = nLine;