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.nIgnoreWhitespace,
577 GetBreakType(), // whitespace only or include punctuation
578 GetByteColoringOption());
579 if (!worddiffs.empty())
581 for (int file = 0; file < m_nBuffers; ++file)
582 m_ptBuf[file]->SetLineFlag(i, LF_TRIVIAL, true, false, false);
589 /** @brief Adjust all different lines that were detected as actually matching moved lines */
590 void CMergeDoc::FlagMovedLines(void)
593 MovedLines *pMovedLines;
595 pMovedLines = m_diffWrapper.GetMovedLines(0);
596 for (i = 0; i < m_ptBuf[0]->GetLineCount(); ++i)
598 int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_RIGHT);
601 TRACE(_T("%d->%d\n"), i, j);
603 // We only flag lines that are already marked as being different
604 int apparent = m_ptBuf[0]->ComputeApparentLine(i);
605 if (m_ptBuf[0]->FlagIsSet(apparent, LF_DIFF))
607 m_ptBuf[0]->SetLineFlag(apparent, LF_MOVED, true, false, false);
612 pMovedLines = m_diffWrapper.GetMovedLines(1);
613 for (i=0; i<m_ptBuf[1]->GetLineCount(); ++i)
615 int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_LEFT);
618 TRACE(_T("%d->%d\n"), i, j);
620 // We only flag lines that are already marked as being different
621 int apparent = m_ptBuf[1]->ComputeApparentLine(i);
622 if (m_ptBuf[1]->FlagIsSet(apparent, LF_DIFF))
624 m_ptBuf[1]->SetLineFlag(apparent, LF_MOVED, true, false, false);
632 pMovedLines = m_diffWrapper.GetMovedLines(1);
633 for (i=0; i<m_ptBuf[1]->GetLineCount(); ++i)
635 int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_RIGHT);
638 TRACE(_T("%d->%d\n"), i, j);
640 // We only flag lines that are already marked as being different
641 int apparent = m_ptBuf[1]->ComputeApparentLine(i);
642 if (m_ptBuf[1]->FlagIsSet(apparent, LF_DIFF))
644 m_ptBuf[1]->SetLineFlag(apparent, LF_MOVED, true, false, false);
649 pMovedLines = m_diffWrapper.GetMovedLines(2);
650 for (i=0; i<m_ptBuf[2]->GetLineCount(); ++i)
652 int j = pMovedLines->LineInBlock(i, MovedLines::SIDE_LEFT);
655 TRACE(_T("%d->%d\n"), i, j);
657 // We only flag lines that are already marked as being different
658 int apparent = m_ptBuf[2]->ComputeApparentLine(i);
659 if (m_ptBuf[2]->FlagIsSet(apparent, LF_DIFF))
661 m_ptBuf[2]->SetLineFlag(apparent, LF_MOVED, true, false, false);
666 // todo: Need to record actual moved information
669 int CMergeDoc::ShowMessageBox(const String& sText, unsigned nType, unsigned nIDHelp)
671 if (m_pView[0][0] && m_pView[0][0]->IsTextBufferInitialized() && !GetParentFrame()->IsActivated())
673 GetParentFrame()->InitialUpdateFrame(this, true);
674 GetParentFrame()->SendMessageToDescendants(WM_IDLEUPDATECMDUI, static_cast<WPARAM>(true), 0, true, true);
676 return AfxMessageBox(sText.c_str(), nType, nIDHelp);
680 * @brief Prints (error) message by rescan status.
682 * @param nRescanResult [in] Resultcocode from rescan().
683 * @param bIdentical [in] Were files identical?.
684 * @sa CMergeDoc::Rescan()
686 void CMergeDoc::ShowRescanError(int nRescanResult, IDENTLEVEL identical)
688 // Rescan was suppressed, there is no sensible status
689 if (nRescanResult == RESCAN_SUPPRESSED)
694 if (nRescanResult == RESCAN_FILE_ERR)
696 s = _("An error occurred while comparing the files.");
698 ShowMessageBox(s, MB_ICONSTOP);
702 if (nRescanResult == RESCAN_TEMP_ERR)
704 s = _("Temporary files could not be created. Check your temporary path settings.");
706 ShowMessageBox(s, MB_ICONSTOP);
710 // Files are not binaries, but they are identical
711 if (identical != IDENTLEVEL_NONE)
713 if (!m_filePaths.GetLeft().empty() && !m_filePaths.GetMiddle().empty() && !m_filePaths.GetRight().empty() &&
714 m_filePaths.GetLeft() == m_filePaths.GetRight() && m_filePaths.GetMiddle() == m_filePaths.GetRight())
716 // compare file to itself, a custom message so user may hide the message in this case only
717 s = _("The same file is opened in both panels.");
718 ShowMessageBox(s, MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN, IDS_FILE_TO_ITSELF);
720 else if (identical == IDENTLEVEL_ALL)
722 UINT nFlags = MB_ICONINFORMATION | MB_DONT_DISPLAY_AGAIN;
724 if (theApp.m_bExitIfNoDiff == MergeCmdLineInfo::Exit)
726 // Show the "files are identical" for basic "exit no diff" flag
727 // If user don't want to see the message one uses the quiet version
728 // of the "exit no diff".
729 nFlags &= ~MB_DONT_DISPLAY_AGAIN;
732 if (theApp.m_bExitIfNoDiff != MergeCmdLineInfo::ExitQuiet)
734 s = _("The selected files are identical.");
735 ShowMessageBox(s, nFlags, IDS_FILESSAME);
738 // Exit application if files are identical.
739 if (theApp.m_bExitIfNoDiff == MergeCmdLineInfo::Exit ||
740 theApp.m_bExitIfNoDiff == MergeCmdLineInfo::ExitQuiet)
742 AfxGetMainWnd()->PostMessage(WM_COMMAND, ID_APP_EXIT);
748 bool CMergeDoc::Undo()
754 * @brief An instance of RescanSuppress prevents rescan during its lifetime
755 * (or until its Clear method is called, which ends its effect).
760 explicit RescanSuppress(CMergeDoc & doc) : m_doc(doc)
763 m_bPrev = doc.m_bEnableRescan;
764 m_doc.m_bEnableRescan = false;
771 m_doc.m_bEnableRescan = m_bPrev;
785 * @brief Copy all diffs from one side to side.
786 * @param [in] srcPane Source side from which diff is copied
787 * @param [in] dstPane Destination side
789 void CMergeDoc::CopyAllList(int srcPane, int dstPane)
791 CopyMultipleList(srcPane, dstPane, 0, m_diffList.GetSize() - 1);
795 * @brief Copy range of diffs from one side to side.
796 * This function copies given range of differences from side to another.
797 * Ignored differences are skipped, and not copied.
798 * @param [in] srcPane Source side from which diff is copied
799 * @param [in] dstPane Destination side
800 * @param [in] firstDiff First diff copied (0-based index)
801 * @param [in] lastDiff Last diff copied (0-based index)
803 void CMergeDoc::CopyMultipleList(int srcPane, int dstPane, int firstDiff, int lastDiff, int firstWordDiff, int lastWordDiff)
806 if (firstDiff > lastDiff)
807 _RPTF0(_CRT_ERROR, "Invalid diff range (firstDiff > lastDiff)!");
809 _RPTF0(_CRT_ERROR, "Invalid diff range (firstDiff < 0)!");
810 if (lastDiff > m_diffList.GetSize() - 1)
811 _RPTF0(_CRT_ERROR, "Invalid diff range (lastDiff < diffcount)!");
814 lastDiff = min(m_diffList.GetSize() - 1, lastDiff);
815 firstDiff = max(0, firstDiff);
816 if (firstDiff > lastDiff)
819 RescanSuppress suppressRescan(*this);
821 // Note we don't care about m_nDiffs count to become zero,
822 // because we don't rescan() so it does not change
824 SetCurrentDiff(lastDiff);
826 bool bGroupWithPrevious = false;
827 if (firstWordDiff <= 0 && lastWordDiff == -1)
829 if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious, true))
830 return; // sync failure
834 if (!WordListCopy(srcPane, dstPane, lastDiff,
835 (firstDiff == lastDiff) ? firstWordDiff : 0, lastWordDiff, nullptr, bGroupWithPrevious, true))
836 return; // sync failure
839 SetEditedAfterRescan(dstPane);
841 int nGroup = GetActiveMergeView()->m_nThisGroup;
842 CMergeEditView *pViewSrc = m_pView[nGroup][srcPane];
843 CMergeEditView *pViewDst = m_pView[nGroup][dstPane];
844 CPoint currentPosSrc = pViewSrc->GetCursorPos();
846 CPoint currentPosDst = pViewDst->GetCursorPos();
850 pViewDst->SetCursorPos(pt);
851 pViewDst->SetNewSelection(pt, pt, false);
852 pViewDst->SetNewAnchor(pt);
854 // copy from bottom up is more efficient
855 for (int i = lastDiff - 1; i >= firstDiff; --i)
857 if (m_diffList.IsDiffSignificant(i))
860 const DIFFRANGE *pdi = m_diffList.DiffRangeAt(i);
861 if (currentPosDst.y > pdi->dend)
863 if (pdi->blank[dstPane] >= 0)
864 currentPosDst.y -= pdi->dend - pdi->blank[dstPane] + 1;
865 else if (pdi->blank[srcPane] >= 0)
866 currentPosDst.y -= pdi->dend - pdi->blank[srcPane] + 1;
868 // Group merge with previous (merge undo data to one action)
869 bGroupWithPrevious = true;
870 if (i > firstDiff || firstWordDiff <= 0)
872 if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious, false))
873 break; // sync failure
877 if (!WordListCopy(srcPane, dstPane, firstDiff, firstWordDiff, -1, nullptr, bGroupWithPrevious, false))
878 break; // sync failure
883 ForEachView(dstPane, [currentPosDst](auto& pView) {
884 pView->SetCursorPos(currentPosDst);
885 pView->SetNewSelection(currentPosDst, currentPosDst, false);
886 pView->SetNewAnchor(currentPosDst);
889 suppressRescan.Clear(); // done suppress Rescan
893 enum MergeResult { NoMergeNeeded, Merged, Conflict };
896 static std::pair<MergeResult, Type> DoMergeValue(Type left, Type middle, Type right, int dstPane)
898 bool equal_all = middle == left && middle == right && left == right;
900 return std::pair<MergeResult, Type>(NoMergeNeeded, left);
901 bool conflict = middle != left && middle != right && left != right;
903 return std::pair<MergeResult, Type>(Conflict, left);
908 return std::pair<MergeResult, Type>(Merged, middle);
912 return std::pair<MergeResult, Type>(Merged, right);
914 return std::pair<MergeResult, Type>(Merged, left);
918 return std::pair<MergeResult, Type>(Merged, middle);
921 return std::pair<MergeResult, Type>(NoMergeNeeded, left);
925 * @brief Do auto-merge.
926 * @param [in] dstPane Destination side
928 void CMergeDoc::DoAutoMerge(int dstPane)
930 const int lastDiff = m_diffList.GetSize() - 1;
931 const int firstDiff = 0;
932 bool bGroupWithPrevious = false;
933 int autoMergedCount = 0;
934 int unresolvedConflictCount = 0;
936 std::pair<MergeResult, FileTextEncoding> mergedEncoding =
937 DoMergeValue(m_ptBuf[0]->getEncoding(), m_ptBuf[1]->getEncoding(), m_ptBuf[2]->getEncoding(), dstPane);
938 if (mergedEncoding.first == Merged)
940 ShowMessageBox(_("The change of codepage has been merged"), MB_ICONINFORMATION);
941 m_ptBuf[dstPane]->setEncoding(mergedEncoding.second);
943 else if (mergedEncoding.first == Conflict)
944 ShowMessageBox(_("The changes of codepage are conflicting"), MB_ICONINFORMATION);
946 std::pair<MergeResult, CRLFSTYLE> mergedEOLStyle =
947 DoMergeValue(m_ptBuf[0]->GetCRLFMode(), m_ptBuf[1]->GetCRLFMode(), m_ptBuf[2]->GetCRLFMode(), dstPane);
948 if (mergedEOLStyle.first == Merged)
950 ShowMessageBox(_("The change of EOL has been merged"), MB_ICONINFORMATION);
951 m_ptBuf[dstPane]->SetCRLFMode(mergedEOLStyle.second);
953 else if (mergedEOLStyle.first == Conflict)
954 ShowMessageBox(_("The changes of EOL are conflicting"), MB_ICONINFORMATION);
956 RescanSuppress suppressRescan(*this);
958 // Note we don't care about m_nDiffs count to become zero,
959 // because we don't rescan() so it does not change
961 SetCurrentDiff(lastDiff);
963 SetEditedAfterRescan(dstPane);
965 int nGroup = GetActiveMergeView()->m_nThisGroup;
966 CMergeEditView *pViewDst = m_pView[nGroup][dstPane];
967 CPoint currentPosDst = pViewDst->GetCursorPos();
971 pViewDst->SetCursorPos(pt);
972 pViewDst->SetNewSelection(pt, pt, false);
973 pViewDst->SetNewAnchor(pt);
975 // copy from bottom up is more efficient
976 for (int i = lastDiff; i >= firstDiff; --i)
978 const DIFFRANGE *pdi = m_diffList.DiffRangeAt(i);
979 const int srcPane = m_diffList.GetMergeableSrcIndex(i, dstPane);
983 if (currentPosDst.y > pdi->dend)
985 if (pdi->blank[dstPane] >= 0)
986 currentPosDst.y -= pdi->dend - pdi->blank[dstPane] + 1;
987 else if (pdi->blank[srcPane] >= 0)
988 currentPosDst.y -= pdi->dend - pdi->blank[srcPane] + 1;
990 // Group merge with previous (merge undo data to one action)
991 if (!ListCopy(srcPane, dstPane, -1, bGroupWithPrevious, false))
992 break; // sync failure
993 if (!bGroupWithPrevious)
994 bGroupWithPrevious = true;
997 if (pdi->op == OP_DIFF)
998 ++unresolvedConflictCount;
1001 ForEachView(dstPane, [currentPosDst](auto& pView) {
1002 pView->SetCursorPos(currentPosDst);
1003 pView->SetNewSelection(currentPosDst, currentPosDst, false);
1004 pView->SetNewAnchor(currentPosDst);
1007 suppressRescan.Clear(); // done suppress Rescan
1009 UpdateHeaderPath(dstPane);
1011 if (autoMergedCount > 0)
1012 m_bAutoMerged = true;
1014 // move to first conflict
1015 const int nDiff = m_diffList.FirstSignificant3wayDiff(THREEWAYDIFFTYPE_CONFLICT);
1017 pViewDst->SelectDiff(nDiff, true, false);
1020 strutils::format_string2(
1021 _T("The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"),
1022 strutils::format(_T("%d"), autoMergedCount),
1023 strutils::format(_T("%d"), unresolvedConflictCount)),
1024 MB_ICONINFORMATION);
1028 * @brief Sanity check difference.
1030 * Checks that lines in difference are inside difference in both files.
1031 * If file is edited, lines added or removed diff lines get out of sync and
1032 * merging fails miserably.
1034 * @param [in] dr Difference to check.
1035 * @return true if difference lines match, false otherwise.
1037 bool CMergeDoc::SanityCheckDiff(DIFFRANGE dr) const
1039 const int cd_dbegin = dr.dbegin;
1040 const int cd_dend = dr.dend;
1042 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
1044 // Must ensure line number is in range before getting line flags
1045 if (cd_dend >= m_ptBuf[nBuffer]->GetLineCount())
1048 // Optimization - check last line first so we don't need to
1049 // check whole diff for obvious cases
1050 DWORD dwFlags = m_ptBuf[nBuffer]->GetLineFlags(cd_dend);
1051 if (!(dwFlags & LF_WINMERGE_FLAGS))
1055 for (int line = cd_dbegin; line < cd_dend; line++)
1057 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
1059 DWORD dwFlags = m_ptBuf[nBuffer]->GetLineFlags(cd_dend);
1060 if (!(dwFlags & LF_WINMERGE_FLAGS))
1068 * @brief Copy selected (=current) difference from from side to side.
1069 * @param [in] srcPane Source side from which diff is copied
1070 * @param [in] dstPane Destination side
1071 * @param [in] nDiff Diff to copy, if -1 function determines it.
1072 * @param [in] bGroupWithPrevious Adds diff to same undo group with
1073 * @return true if ok, false if sync failure & need to abort copy
1074 * previous action (allows one undo for copy all)
1076 bool CMergeDoc::ListCopy(int srcPane, int dstPane, int nDiff /* = -1*/,
1077 bool bGroupWithPrevious /*= false*/, bool bUpdateView /*= true*/)
1079 int nGroup = GetActiveMergeView()->m_nThisGroup;
1080 CMergeEditView *pViewSrc = m_pView[nGroup][srcPane];
1081 CMergeEditView *pViewDst = m_pView[nGroup][dstPane];
1082 CCrystalTextView *pSource = bUpdateView ? pViewDst : nullptr;
1084 // suppress Rescan during this method
1085 // (Not only do we not want to rescan a lot of times, but
1086 // it will wreck the line status array to rescan as we merge)
1087 RescanSuppress suppressRescan(*this);
1089 // If diff-number not given, determine it from active view
1092 nDiff = GetCurrentDiff();
1094 // No current diff, but maybe cursor is in diff?
1095 if (nDiff == -1 && (pViewSrc->IsCursorInDiff() ||
1096 pViewDst->IsCursorInDiff()))
1098 // Find out diff under cursor
1099 CPoint ptCursor = GetActiveMergeView()->GetCursorPos();
1100 nDiff = m_diffList.LineToDiff(ptCursor.y);
1107 VERIFY(m_diffList.GetDiff(nDiff, cd));
1108 CDiffTextBuffer& sbuf = *m_ptBuf[srcPane];
1109 CDiffTextBuffer& dbuf = *m_ptBuf[dstPane];
1110 bool bSrcWasMod = sbuf.IsModified();
1111 const int cd_dbegin = cd.dbegin;
1112 const int cd_dend = cd.dend;
1113 const int cd_blank = cd.blank[srcPane];
1114 bool bInSync = SanityCheckDiff(cd);
1118 LangMessageBox(IDS_VIEWS_OUTOFSYNC, MB_ICONSTOP);
1119 return false; // abort copying
1122 // If we remove whole diff from current view, we must fix cursor
1123 // position first. Normally we would move to end of previous line,
1124 // but we want to move to begin of that line for usability.
1127 CPoint currentPos = pViewDst->GetCursorPos();
1129 if (currentPos.y > cd_dend)
1131 if (cd.blank[dstPane] >= 0)
1132 currentPos.y -= cd_dend - cd.blank[dstPane] + 1;
1133 else if (cd.blank[srcPane] >= 0)
1134 currentPos.y -= cd_dend - cd.blank[srcPane] + 1;
1136 ForEachView(dstPane, [currentPos](auto& pView) { pView->SetCursorPos(currentPos); });
1139 // if the current diff contains missing lines, remove them from both sides
1140 int limit = cd_dend;
1142 // curView is the view which is changed, so the opposite of the source view
1143 dbuf.BeginUndoGroup(bGroupWithPrevious);
1146 // text was missing, so delete rest of lines on both sides
1147 // delete only on destination side since rescan will clear the other side
1148 if (cd_dend + 1 < dbuf.GetLineCount())
1150 dbuf.DeleteText(pSource, cd_blank, 0, cd_dend+1, 0, CE_ACTION_MERGE);
1154 // To removing EOL chars of last line, deletes from the end of the line (cd_blank - 1).
1155 ASSERT(cd_blank > 0);
1156 dbuf.DeleteText(pSource, cd_blank-1, dbuf.GetLineLength(cd_blank-1), cd_dend, dbuf.GetLineLength(cd_dend), CE_ACTION_MERGE);
1160 dbuf.FlushUndoGroup(pSource);
1161 dbuf.BeginUndoGroup(true);
1165 // copy the selected text over
1166 if (cd_dbegin <= limit)
1168 // text exists on left side, so just replace
1169 dbuf.ReplaceFullLines(dbuf, sbuf, pSource, cd_dbegin, limit, CE_ACTION_MERGE);
1170 dbuf.FlushUndoGroup(pSource);
1171 dbuf.BeginUndoGroup(true);
1173 dbuf.FlushUndoGroup(pSource);
1178 // reset the mod status of the source view because we do make some
1179 // changes, but none that concern the source text
1180 sbuf.SetModified(bSrcWasMod);
1183 suppressRescan.Clear(); // done suppress Rescan
1188 bool CMergeDoc::WordListCopy(int srcPane, int dstPane, int nDiff, int firstWordDiff, int lastWordDiff,
1189 const std::vector<int> *pWordDiffIndice, bool bGroupWithPrevious /*= false*/, bool bUpdateView /*= true*/)
1191 int nGroup = GetActiveMergeView()->m_nThisGroup;
1192 CMergeEditView *pViewSrc = m_pView[nGroup][srcPane];
1193 CMergeEditView *pViewDst = m_pView[nGroup][dstPane];
1194 CCrystalTextView *pSource = bUpdateView ? pViewDst : nullptr;
1196 // suppress Rescan during this method
1197 // (Not only do we not want to rescan a lot of times, but
1198 // it will wreck the line status array to rescan as we merge)
1199 RescanSuppress suppressRescan(*this);
1202 VERIFY(m_diffList.GetDiff(nDiff, cd));
1203 CDiffTextBuffer& sbuf = *m_ptBuf[srcPane];
1204 CDiffTextBuffer& dbuf = *m_ptBuf[dstPane];
1205 bool bSrcWasMod = sbuf.IsModified();
1206 const int cd_dbegin = cd.dbegin;
1207 const int cd_dend = cd.dend;
1208 const int cd_blank = cd.blank[srcPane];
1209 bool bInSync = SanityCheckDiff(cd);
1213 LangMessageBox(IDS_VIEWS_OUTOFSYNC, MB_ICONSTOP);
1214 return false; // abort copying
1217 std::vector<WordDiff> worddiffs = GetWordDiffArrayInDiffBlock(nDiff);
1219 if (worddiffs.empty())
1222 if (cd.end[srcPane] < cd.begin[srcPane])
1223 return ListCopy(srcPane, dstPane, nDiff, bGroupWithPrevious, bUpdateView);
1225 if (firstWordDiff == -1)
1227 if (lastWordDiff == -1)
1228 lastWordDiff = static_cast<int>(worddiffs.size() - 1);
1230 // If we remove whole diff from current view, we must fix cursor
1231 // position first. Normally we would move to end of previous line,
1232 // but we want to move to begin of that line for usability.
1235 CPoint currentPos = pViewDst->GetCursorPos();
1237 if (currentPos.y > cd_dend)
1239 if (cd.blank[dstPane] >= 0)
1240 currentPos.y -= cd_dend - cd.blank[dstPane] + 1;
1241 else if (cd.blank[srcPane] >= 0)
1242 currentPos.y -= cd_dend - cd.blank[srcPane] + 1;
1244 ForEachView(dstPane, [currentPos](auto& pView) { pView->SetCursorPos(currentPos); });
1247 // if the current diff contains missing lines, remove them from both sides
1248 int limit = cd_dend;
1250 // curView is the view which is changed, so the opposite of the source view
1251 dbuf.BeginUndoGroup(bGroupWithPrevious);
1253 CString srcText, dstText;
1254 CPoint ptDstStart, ptDstEnd;
1255 CPoint ptSrcStart, ptSrcEnd;
1257 ptDstStart.x = worddiffs[firstWordDiff].begin[dstPane];
1258 ptDstStart.y = worddiffs[firstWordDiff].beginline[dstPane];
1259 ptDstEnd.x = worddiffs[lastWordDiff].end[dstPane];
1260 ptDstEnd.y = worddiffs[lastWordDiff].endline[dstPane];
1261 ptSrcStart.x = worddiffs[firstWordDiff].begin[srcPane];
1262 ptSrcStart.y = worddiffs[firstWordDiff].beginline[srcPane];
1263 ptSrcEnd.x = worddiffs[lastWordDiff].end[srcPane];
1264 ptSrcEnd.y = worddiffs[lastWordDiff].endline[srcPane];
1266 std::vector<int> nDstOffsets(ptDstEnd.y - ptDstStart.y + 2);
1267 std::vector<int> nSrcOffsets(ptSrcEnd.y - ptSrcStart.y + 2);
1269 dbuf.GetTextWithoutEmptys(ptDstStart.y, ptDstStart.x, ptDstEnd.y, ptDstEnd.x, dstText);
1270 sbuf.GetTextWithoutEmptys(ptSrcStart.y, ptSrcStart.x, ptSrcEnd.y, ptSrcEnd.x, srcText);
1273 for (int nLine = ptDstStart.y; nLine <= ptDstEnd.y; nLine++)
1274 nDstOffsets[nLine-ptDstStart.y+1] = nDstOffsets[nLine-ptDstStart.y] + dbuf.GetFullLineLength(nLine);
1276 for (int nLine = ptSrcStart.y; nLine <= ptSrcEnd.y; nLine++)
1277 nSrcOffsets[nLine-ptSrcStart.y+1] = nSrcOffsets[nLine-ptSrcStart.y] + sbuf.GetFullLineLength(nLine);
1279 for (int i = lastWordDiff; i != firstWordDiff-1; --i)
1281 if (pWordDiffIndice && std::find(pWordDiffIndice->begin(), pWordDiffIndice->end(), i) == pWordDiffIndice->end())
1283 int srcBegin = nSrcOffsets[worddiffs[i].beginline[srcPane] - ptSrcStart.y] + worddiffs[i].begin[srcPane];
1284 int srcEnd = nSrcOffsets[worddiffs[i].endline[srcPane] - ptSrcStart.y] + worddiffs[i].end[srcPane];
1285 int dstBegin = nDstOffsets[worddiffs[i].beginline[dstPane] - ptDstStart.y] + worddiffs[i].begin[dstPane];
1286 int dstEnd = nDstOffsets[worddiffs[i].endline[dstPane] - ptDstStart.y] + worddiffs[i].end[dstPane];
1287 dstText = dstText.Mid(0, dstBegin - ptDstStart.x)
1288 + srcText.Mid(srcBegin - ptSrcStart.x, srcEnd - srcBegin)
1289 + dstText.Mid(dstEnd - ptDstStart.x);
1292 dbuf.DeleteText(pSource, ptDstStart.y, ptDstStart.x, ptDstEnd.y, ptDstEnd.x, CE_ACTION_MERGE);
1295 dbuf.InsertText(pSource, ptDstStart.y, ptDstStart.x, dstText, dstText.GetLength(), endl, endc, CE_ACTION_MERGE);
1297 dbuf.FlushUndoGroup(pSource);
1299 // reset the mod status of the source view because we do make some
1300 // changes, but none that concern the source text
1301 sbuf.SetModified(bSrcWasMod);
1303 suppressRescan.Clear(); // done suppress Rescan
1310 * @brief Save file with new filename.
1312 * This function is called by CMergeDoc::DoSave() or CMergeDoc::DoSAveAs()
1313 * to save file with new filename. CMergeDoc::DoSave() calls if saving with
1314 * normal filename fails, to let user choose another filename/location.
1315 * Also, if file is unnamed file (e.g. scratchpad) then it must be saved
1316 * using this function.
1317 * @param [in, out] strPath
1318 * - [in] : Initial path shown to user
1319 * - [out] : Path to new filename if saving succeeds
1320 * @param [in, out] nSaveResult
1321 * - [in] : Statuscode telling why we ended up here. Maybe the result of
1323 * - [out] : Statuscode of this saving try
1324 * @param [in, out] sError Error string from lower level saving code
1325 * @param [in] nBuffer Buffer we are saving
1326 * @return false as long as the user is not satisfied. Calling function
1327 * should not continue until true is returned.
1328 * @sa CMergeDoc::DoSave()
1329 * @sa CMergeDoc::DoSaveAs()
1330 * @sa CMergeDoc::CDiffTextBuffer::SaveToFile()
1332 bool CMergeDoc::TrySaveAs(String &strPath, int &nSaveResult, String & sError,
1333 int nBuffer, PackingInfo * pInfoTempUnpacker)
1337 String strSavePath; // New path for next saving try
1340 int answer = IDOK; // Set default we use for scratchpads
1342 // We shouldn't get here if saving is succeed before
1343 ASSERT(nSaveResult != SAVE_DONE);
1345 // Select message based on reason function called
1346 if (nSaveResult == SAVE_PACK_FAILED)
1348 if (m_nBuffers == 3)
1350 str = strutils::format_string2(
1352 _("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?")
1354 _("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?"):
1355 _("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?")),
1356 strPath, pInfoTempUnpacker->m_PluginName);
1360 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?") :
1361 _("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?"),
1362 strPath, pInfoTempUnpacker->m_PluginName);
1364 // replace the unpacker with a "do nothing" unpacker
1365 pInfoTempUnpacker->Initialize(PLUGIN_MANUAL);
1369 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);
1372 // SAVE_NO_FILENAME is temporarily used for scratchpad.
1373 // So don't ask about saving in that case.
1374 if (nSaveResult != SAVE_NO_FILENAME)
1375 answer = ShowMessageBox(str, MB_OKCANCEL | MB_ICONWARNING);
1381 title = _("Save Left File As");
1382 else if (nBuffer == m_nBuffers - 1)
1383 title = _("Save Right File As");
1385 title = _("Save Middle File As");
1387 if (SelectFile(GetActiveMergeView()->GetSafeHwnd(), s, false, strPath.c_str(), title))
1389 CDiffTextBuffer *pBuffer = m_ptBuf[nBuffer].get();
1391 nSaveResult = pBuffer->SaveToFile(strSavePath, false, sError,
1394 if (nSaveResult == SAVE_DONE)
1396 // We are saving scratchpad (unnamed file)
1397 if (strPath.empty())
1399 m_nBufferType[nBuffer] = BUFFER_UNNAMED_SAVED;
1400 m_strDesc[nBuffer].erase();
1403 strPath = strSavePath;
1404 UpdateHeaderPath(nBuffer);
1410 nSaveResult = SAVE_CANCELLED;
1414 nSaveResult = SAVE_CANCELLED;
1421 * @brief Save file creating backups etc.
1423 * Safe top-level file saving function. Checks validity of given path.
1424 * Creates backup file if wanted to. And if saving to given path fails,
1425 * allows user to select new location/name for file.
1426 * @param [in] szPath Path where to save including filename. Can be
1427 * empty/`nullptr` if new file is created (scratchpad) without filename.
1428 * @param [out] bSaveSuccess Will contain information about save success with
1429 * the original name (to determine if file statuses should be changed)
1430 * @param [in] nBuffer Index (0-based) of buffer to save
1431 * @return Tells if caller can continue (no errors happened)
1432 * @note Return value does not tell if SAVING succeeded. Caller must
1433 * Check value of bSaveSuccess parameter after calling this function!
1434 * @note If CMainFrame::m_strSaveAsPath is non-empty, file is saved
1435 * to directory it points to. If m_strSaveAsPath contains filename,
1436 * that filename is used.
1437 * @sa CMergeDoc::TrySaveAs()
1438 * @sa CMainFrame::CheckSavePath()
1439 * @sa CMergeDoc::CDiffTextBuffer::SaveToFile()
1441 bool CMergeDoc::DoSave(LPCTSTR szPath, bool &bSaveSuccess, int nBuffer)
1443 DiffFileInfo fileInfo;
1444 String strSavePath(szPath);
1445 FileChange fileChanged;
1446 bool bApplyToAll = false;
1449 fileChanged = IsFileChangedOnDisk(szPath, fileInfo, true, nBuffer);
1450 if (fileChanged == FileChanged)
1452 String msg = strutils::format_string1(_("Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"), szPath);
1453 if (ShowMessageBox(msg, MB_ICONWARNING | MB_YESNO) == IDNO)
1455 bSaveSuccess = true;
1460 // use a temp packer
1461 // first copy the m_pInfoUnpacker
1462 // if an error arises during packing, change and take a "do nothing" packer
1463 PackingInfo infoTempUnpacker = *m_pInfoUnpacker;
1465 bSaveSuccess = false;
1467 // Check third arg possibly given from command-line
1468 if (!theApp.m_strSaveAsPath.empty())
1470 if (paths::DoesPathExist(theApp.m_strSaveAsPath) == paths::IS_EXISTING_DIR)
1472 // third arg was a directory, so get append the filename
1474 paths::SplitFilename(szPath, 0, &sname, 0);
1475 strSavePath = theApp.m_strSaveAsPath;
1476 strSavePath = paths::ConcatPath(strSavePath, sname);
1479 strSavePath = theApp.m_strSaveAsPath;
1482 nRetVal = theApp.HandleReadonlySave(strSavePath, false, bApplyToAll);
1483 if (nRetVal == IDCANCEL)
1486 if (!theApp.CreateBackup(false, strSavePath))
1489 // false as long as the user is not satisfied
1490 // true if saving succeeds, even with another filename, or if the user cancels
1491 bool result = false;
1492 // the error code from the latest save operation,
1493 // or SAVE_DONE when the save succeeds
1494 // TODO: Shall we return this code in addition to bSaveSuccess ?
1495 int nSaveErrorCode = SAVE_DONE;
1496 CDiffTextBuffer *pBuffer = m_ptBuf[nBuffer].get();
1498 // Assume empty filename means Scratchpad (unnamed file)
1499 // Todo: This is not needed? - buffer type check should be enough
1500 if (strSavePath.empty())
1501 nSaveErrorCode = SAVE_NO_FILENAME;
1503 // Handle unnamed buffers
1504 if (m_nBufferType[nBuffer] == BUFFER_UNNAMED)
1505 nSaveErrorCode = SAVE_NO_FILENAME;
1508 if (nSaveErrorCode == SAVE_DONE)
1509 // We have a filename, just try to save
1510 nSaveErrorCode = pBuffer->SaveToFile(strSavePath, false, sError, &infoTempUnpacker);
1512 if (nSaveErrorCode != SAVE_DONE)
1514 // Saving failed, user may save to another location if wants to
1516 result = TrySaveAs(strSavePath, nSaveErrorCode, sError, nBuffer, &infoTempUnpacker);
1520 // Saving succeeded with given/selected filename
1521 if (nSaveErrorCode == SAVE_DONE)
1523 // Preserve file times if user wants to
1524 if (GetOptionsMgr()->GetBool(OPT_PRESERVE_FILETIMES))
1526 fileInfo.SetFile(strSavePath);
1529 TFile file(strSavePath);
1530 file.setLastModified(fileInfo.mtime);
1537 m_ptBuf[nBuffer]->SetModified(false);
1538 m_pSaveFileInfo[nBuffer]->Update(strSavePath.c_str());
1539 m_filePaths[nBuffer] = strSavePath;
1540 m_pRescanFileInfo[nBuffer]->Update(m_filePaths[nBuffer].c_str());
1541 UpdateHeaderPath(nBuffer);
1542 bSaveSuccess = true;
1545 else if (nSaveErrorCode == SAVE_CANCELLED)
1547 // User cancelled current operation, lets do what user wanted to do
1554 * @brief Save file with different filename.
1556 * Safe top-level file saving function. Asks user to select filename
1557 * and path. Does not create backups.
1558 * @param [in] szPath Path where to save including filename. Can be
1559 * empty/`nullptr` if new file is created (scratchpad) without filename.
1560 * @param [out] bSaveSuccess Will contain information about save success with
1561 * the original name (to determine if file statuses should be changed)
1562 * @param [in] nBuffer Index (0-based) of buffer to save
1563 * @return Tells if caller can continue (no errors happened)
1564 * @note Return value does not tell if SAVING succeeded. Caller must
1565 * Check value of bSaveSuccess parameter after calling this function!
1566 * @sa CMergeDoc::TrySaveAs()
1567 * @sa CMainFrame::CheckSavePath()
1568 * @sa CMergeDoc::CDiffTextBuffer::SaveToFile()
1570 bool CMergeDoc::DoSaveAs(LPCTSTR szPath, bool &bSaveSuccess, int nBuffer)
1572 String strSavePath(szPath);
1574 // use a temp packer
1575 // first copy the m_pInfoUnpacker
1576 // if an error arises during packing, change and take a "do nothing" packer
1577 PackingInfo infoTempUnpacker = *m_pInfoUnpacker;
1579 bSaveSuccess = false;
1580 // false as long as the user is not satisfied
1581 // true if saving succeeds, even with another filename, or if the user cancels
1582 bool result = false;
1583 // the error code from the latest save operation,
1584 // or SAVE_DONE when the save succeeds
1585 // TODO: Shall we return this code in addition to bSaveSuccess ?
1586 int nSaveErrorCode = SAVE_DONE;
1588 // Use SAVE_NO_FILENAME to prevent asking about error
1589 nSaveErrorCode = SAVE_NO_FILENAME;
1591 // Loop until user succeeds saving or cancels
1594 result = TrySaveAs(strSavePath, nSaveErrorCode, sError, nBuffer, &infoTempUnpacker);
1597 // Saving succeeded with given/selected filename
1598 if (nSaveErrorCode == SAVE_DONE)
1600 m_pSaveFileInfo[nBuffer]->Update(strSavePath);
1601 m_filePaths[nBuffer] = strSavePath;
1602 m_pRescanFileInfo[nBuffer]->Update(m_filePaths[nBuffer]);
1603 UpdateHeaderPath(nBuffer);
1604 bSaveSuccess = true;
1611 * @brief Get left->right info for a moved line (apparent line number)
1613 int CMergeDoc::RightLineInMovedBlock(int nBuffer, int apparentLeftLine)
1615 if (!(m_ptBuf[nBuffer]->GetLineFlags(apparentLeftLine) & LF_MOVED))
1618 int realLeftLine = m_ptBuf[nBuffer]->ComputeRealLine(apparentLeftLine);
1619 int realRightLine = -1;
1620 if (m_diffWrapper.GetDetectMovedBlocks())
1622 realRightLine = m_diffWrapper.GetMovedLines(nBuffer)->LineInBlock(realLeftLine,
1623 MovedLines::SIDE_RIGHT);
1625 if (realRightLine != -1)
1626 return m_ptBuf[nBuffer + 1]->ComputeApparentLine(realRightLine);
1632 * @brief Get right->left info for a moved line (apparent line number)
1634 int CMergeDoc::LeftLineInMovedBlock(int nBuffer, int apparentRightLine)
1636 if (!(m_ptBuf[nBuffer]->GetLineFlags(apparentRightLine) & LF_MOVED))
1639 int realRightLine = m_ptBuf[nBuffer]->ComputeRealLine(apparentRightLine);
1640 int realLeftLine = -1;
1641 if (m_diffWrapper.GetDetectMovedBlocks())
1643 realLeftLine = m_diffWrapper.GetMovedLines(nBuffer)->LineInBlock(realRightLine,
1644 MovedLines::SIDE_LEFT);
1646 if (realLeftLine != -1)
1647 return m_ptBuf[nBuffer - 1]->ComputeApparentLine(realLeftLine);
1653 * @brief Save modified documents.
1654 * This function asks if user wants to save modified documents. We also
1655 * allow user to cancel the closing.
1657 * There is a special trick avoiding showing two save-dialogs, as MFC framework
1658 * sometimes calls this function twice. We use static counter for these calls
1659 * and if we already have saving in progress (counter == 1) we skip the new
1662 * @return true if docs are closed, false if closing is cancelled.
1664 BOOL CMergeDoc::SaveModified()
1671 if (PromptAndSaveIfNeeded(true))
1684 * @brief Sets the current difference.
1685 * @param [in] nDiff Difference to set as current difference.
1687 void CMergeDoc::SetCurrentDiff(int nDiff)
1689 if (nDiff >= 0 && nDiff <= m_diffList.LastSignificantDiff())
1696 * @brief Take care of rescanning document.
1698 * Update view and restore cursor and scroll position after
1699 * rescanning document.
1700 * @param [in] bForced If true rescan cannot be suppressed
1702 void CMergeDoc::FlushAndRescan(bool bForced /* =false */)
1704 // Ignore suppressing when forced rescan
1706 if (!m_bEnableRescan) return;
1708 CWaitCursor waitstatus;
1710 CMergeEditView *pActiveView = GetActiveMergeView();
1712 // store cursors and hide caret
1713 ForEachView([](auto& pView) { pView->PushCursors(); });
1714 pActiveView->HideCursor();
1716 bool bBinary = false;
1717 IDENTLEVEL identical = IDENTLEVEL_NONE;
1718 int nRescanResult = Rescan(bBinary, identical, bForced);
1720 // restore cursors and caret
1721 ForEachView([](auto& pView) { pView->PopCursors(); });
1722 pActiveView->ShowCursor();
1724 ForEachView(pActiveView->m_nThisPane, [](auto& pView) {
1725 // because of ghostlines, m_nTopLine may differ just after Rescan
1726 // scroll both views to the same top line
1727 pView->UpdateSiblingScrollPos(false);
1729 // make sure we see the cursor from the curent view
1730 pView->EnsureVisible(pView->GetCursorPos());
1734 UpdateAllViews(nullptr);
1736 // Show possible error after updating screen
1737 if (nRescanResult != RESCAN_SUPPRESSED)
1738 ShowRescanError(nRescanResult, identical);
1739 m_LastRescan = COleDateTime::GetCurrentTime();
1743 * @brief Saves both files
1745 void CMergeDoc::OnFileSave()
1747 // We will need to know if either of the originals actually changed
1748 // so we know whether to update the diff status
1749 bool bChangedOriginal = false;
1751 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
1753 if (m_ptBuf[nBuffer]->IsModified() && !m_ptBuf[nBuffer]->GetReadOnly())
1755 // (why we don't use return value of DoSave)
1756 // DoSave will return true if it wrote to something successfully
1757 // but we have to know if it overwrote the original file
1758 bool bSaveOriginal = false;
1759 DoSave(m_filePaths[nBuffer].c_str(), bSaveOriginal, nBuffer );
1761 bChangedOriginal = true;
1765 // If either of the actual source files being compared was changed
1766 // we need to update status in the dir view
1767 if (bChangedOriginal)
1769 // If DirDoc contains diffs
1770 if (m_pDirDoc != nullptr && m_pDirDoc->HasDiffs())
1772 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
1774 if (m_bEditAfterRescan[nBuffer])
1776 FlushAndRescan(false);
1781 bool bIdentical = !m_diffList.HasSignificantDiffs(); // True if status should be set to identical
1782 m_pDirDoc->UpdateChangedItem(m_filePaths, m_diffList.GetSignificantDiffs(),
1783 m_nTrivialDiffs, bIdentical);
1788 void CMergeDoc::DoFileSave(int nBuffer)
1790 bool bSaveSuccess = false;
1791 bool bModified = false;
1793 if (m_ptBuf[nBuffer]->IsModified() && !m_ptBuf[nBuffer]->GetReadOnly())
1796 DoSave(m_filePaths[nBuffer].c_str(), bSaveSuccess, nBuffer );
1799 // If file were modified and saving succeeded,
1800 // update status on dir view
1801 if (bModified && bSaveSuccess)
1803 // If DirDoc contains compare results
1804 if (m_pDirDoc != nullptr && m_pDirDoc->HasDiffs())
1806 for (int nBuffer1 = 0; nBuffer1 < m_nBuffers; nBuffer1++)
1808 if (m_bEditAfterRescan[nBuffer1])
1810 FlushAndRescan(false);
1815 bool bIdentical = !m_diffList.HasSignificantDiffs(); // True if status should be set to identical
1816 m_pDirDoc->UpdateChangedItem(m_filePaths, m_diffList.GetSignificantDiffs(),
1817 m_nTrivialDiffs, bIdentical);
1823 * @brief Saves left-side file
1825 void CMergeDoc::OnFileSaveLeft()
1831 * @brief Saves middle-side file
1833 void CMergeDoc::OnFileSaveMiddle()
1839 * @brief Saves right-side file
1841 void CMergeDoc::OnFileSaveRight()
1843 DoFileSave(m_nBuffers - 1);
1847 * @brief Saves left-side file with name asked
1849 void CMergeDoc::OnFileSaveAsLeft()
1851 bool bSaveResult = false;
1852 DoSaveAs(m_filePaths.GetLeft().c_str(), bSaveResult, 0);
1856 * @brief Called when "Save middle (as...)" item is updated
1858 void CMergeDoc::OnUpdateFileSaveAsMiddle(CCmdUI* pCmdUI)
1860 pCmdUI->Enable(m_nBuffers == 3);
1864 * @brief Saves right-side file with name asked
1866 void CMergeDoc::OnFileSaveAsMiddle()
1868 bool bSaveResult = false;
1869 DoSaveAs(m_filePaths.GetMiddle().c_str(), bSaveResult, 1);
1873 * @brief Saves right-side file with name asked
1875 void CMergeDoc::OnFileSaveAsRight()
1877 bool bSaveResult = false;
1878 DoSaveAs(m_filePaths.GetRight().c_str(), bSaveResult, m_nBuffers - 1);
1882 * @brief Update diff-number pane text in file compare.
1883 * The diff number pane shows selected difference/amount of differences when
1884 * there is difference selected. If there is no difference selected, then
1885 * the panel shows amount of differences. If there are ignored differences,
1886 * those are not count into numbers.
1887 * @param [in] pCmdUI UI component to update.
1889 void CMergeDoc::OnUpdateStatusNum(CCmdUI* pCmdUI)
1891 TCHAR sIdx[32] = { 0 };
1892 TCHAR sCnt[32] = { 0 };
1894 const int nDiffs = m_diffList.GetSignificantDiffs();
1896 // Files are identical - show text "Identical"
1900 // There are differences, but no selected diff
1901 // - show amount of diffs
1902 else if (GetCurrentDiff() < 0)
1904 s = nDiffs == 1 ? _("1 Difference Found") : _("%1 Differences Found");
1905 _itot_s(nDiffs, sCnt, 10);
1906 strutils::replace(s, _T("%1"), sCnt);
1909 // There are differences and diff selected
1910 // - show diff number and amount of diffs
1913 s = _("Difference %1 of %2");
1914 const int signInd = m_diffList.GetSignificantIndex(GetCurrentDiff());
1915 _itot_s(signInd + 1, sIdx, 10);
1916 strutils::replace(s, _T("%1"), sIdx);
1917 _itot_s(nDiffs, sCnt, 10);
1918 strutils::replace(s, _T("%2"), sCnt);
1920 pCmdUI->SetText(s.c_str());
1924 * @brief Update plugin name
1925 * @param [in] pCmdUI UI component to update.
1927 void CMergeDoc::OnUpdatePluginName(CCmdUI* pCmdUI)
1930 if (m_pInfoUnpacker && !m_pInfoUnpacker->m_PluginName.empty())
1931 pluginNames += m_pInfoUnpacker->m_PluginName + _T("&");
1932 PrediffingInfo prediffer;
1933 GetPrediffer(&prediffer);
1934 if (!prediffer.m_PluginName.empty())
1935 pluginNames += prediffer.m_PluginName + _T("&");
1936 pCmdUI->SetText(pluginNames.substr(0, pluginNames.length() - 1).c_str());
1940 * @brief Change number of diff context lines
1942 void CMergeDoc::OnDiffContext(UINT nID)
1946 case ID_VIEW_DIFFCONTEXT_0:
1947 m_nDiffContext = 0; break;
1948 case ID_VIEW_DIFFCONTEXT_1:
1949 m_nDiffContext = 1; break;
1950 case ID_VIEW_DIFFCONTEXT_3:
1951 m_nDiffContext = 3; break;
1952 case ID_VIEW_DIFFCONTEXT_5:
1953 m_nDiffContext = 5; break;
1954 case ID_VIEW_DIFFCONTEXT_7:
1955 m_nDiffContext = 7; break;
1956 case ID_VIEW_DIFFCONTEXT_9:
1957 m_nDiffContext = 9; break;
1958 case ID_VIEW_DIFFCONTEXT_TOGGLE:
1959 m_nDiffContext = -m_nDiffContext - 1; break;
1960 case ID_VIEW_DIFFCONTEXT_ALL:
1961 if (m_nDiffContext >= 0)
1962 m_nDiffContext = -m_nDiffContext - 1;
1965 GetOptionsMgr()->SaveOption(OPT_DIFF_CONTEXT, m_nDiffContext);
1966 FlushAndRescan(true);
1970 * @brief Update number of diff context lines
1972 void CMergeDoc::OnUpdateDiffContext(CCmdUI* pCmdUI)
1975 switch (pCmdUI->m_nID)
1977 case ID_VIEW_DIFFCONTEXT_0:
1978 bCheck = (m_nDiffContext == 0); break;
1979 case ID_VIEW_DIFFCONTEXT_1:
1980 bCheck = (m_nDiffContext == 1); break;
1981 case ID_VIEW_DIFFCONTEXT_3:
1982 bCheck = (m_nDiffContext == 3); break;
1983 case ID_VIEW_DIFFCONTEXT_5:
1984 bCheck = (m_nDiffContext == 5); break;
1985 case ID_VIEW_DIFFCONTEXT_7:
1986 bCheck = (m_nDiffContext == 7); break;
1987 case ID_VIEW_DIFFCONTEXT_9:
1988 bCheck = (m_nDiffContext == 9); break;
1989 case ID_VIEW_DIFFCONTEXT_TOGGLE:
1990 bCheck = false; break;
1992 bCheck = (m_nDiffContext < 0); break;
1994 pCmdUI->SetCheck(bCheck);
1995 pCmdUI->Enable(true);
1999 * @brief Build the diff array and prepare buffers accordingly (insert ghost lines, set WinMerge flags)
2001 * @note After PrimeTextBuffers(), all buffers should have the same length.
2003 void CMergeDoc::PrimeTextBuffers()
2006 m_nTrivialDiffs = 0;
2008 int nDiffCount = m_diffList.GetSize();
2011 // walk the diff list and calculate numbers of extra lines to add
2012 int extras[3] = {0, 0, 0}; // extra lines added to each view
2013 m_diffList.GetExtraLinesCounts(m_nBuffers, extras);
2015 // resize m_aLines once for each view
2016 UINT lcount[3] = {0, 0, 0};
2017 UINT lcountnew[3] = {0, 0, 0};
2020 for (file = 0; file < m_nBuffers; file++)
2022 lcount[file] = m_ptBuf[file]->GetLineCount();
2023 lcountnew[file] = lcount[file] + extras[file];
2024 lcountmax = max(lcountmax, lcountnew[file]);
2026 for (file = 0; file < m_nBuffers; file++)
2028 m_ptBuf[file]->m_aLines.resize(lcountmax);
2031 // walk the diff list backward, move existing lines to proper place,
2032 // add ghost lines, and set flags
2033 for (nDiff = nDiffCount - 1; nDiff >= 0; nDiff --)
2036 VERIFY(m_diffList.GetDiff(nDiff, curDiff));
2038 // move matched lines after curDiff
2039 int nline[3] = { 0, 0, 0 };
2040 for (file = 0; file < m_nBuffers; file++)
2041 nline[file] = lcount[file] - curDiff.end[file] - 1; // #lines on left/middle/right after current diff
2042 // Matched lines should really match...
2043 // But matched lines after last diff may differ because of empty last line (see function's note)
2044 if (nDiff < nDiffCount - 1)
2045 ASSERT(nline[0] == nline[1]);
2048 for (file = 0; file < m_nBuffers; file++)
2050 // Move all lines after current diff down as far as needed
2051 // for any ghost lines we're about to insert
2052 m_ptBuf[file]->MoveLine(curDiff.end[file]+1, lcount[file]-1, lcountnew[file]-nline[file]);
2053 lcountnew[file] -= nline[file];
2054 lcount[file] -= nline[file];
2055 // move unmatched lines and add ghost lines
2056 nline[file] = curDiff.end[file] - curDiff.begin[file] + 1; // #lines in diff on left/middle/right
2057 nmaxline = max(nmaxline, nline[file]);
2060 for (file = 0; file < m_nBuffers; file++)
2062 DWORD dflag = LF_GHOST;
2063 if ((file == 0 && curDiff.op == OP_3RDONLY) || (file == 2 && curDiff.op == OP_1STONLY))
2065 m_ptBuf[file]->MoveLine(curDiff.begin[file], curDiff.end[file], lcountnew[file]-nmaxline);
2066 int nextra = nmaxline - nline[file];
2069 m_ptBuf[file]->SetEmptyLine(lcountnew[file] - nextra, nextra);
2070 for (int i = 1; i <= nextra; i++)
2071 m_ptBuf[file]->SetLineFlag(lcountnew[file]-i, dflag, true, false, false);
2073 lcountnew[file] -= nmaxline;
2075 lcount[file] -= nline[file];
2078 // set dbegin, dend, blank, and line flags
2079 curDiff.dbegin = lcountnew[0];
2085 // fall through and handle as diff
2092 curDiff.dend = lcountnew[0]+nmaxline-1;
2093 for (file = 0; file < m_nBuffers; file++)
2095 curDiff.blank[file] = -1;
2096 int nextra = nmaxline - nline[file];
2097 if (nmaxline > nline[file])
2099 // more lines on left, ghost lines on right side
2100 curDiff.blank[file] = curDiff.dend + 1 - nextra;
2106 for (file = 0; file < m_nBuffers; file++)
2110 for (i = curDiff.dbegin; i <= curDiff.dend; i++)
2112 if (curDiff.blank[file] == -1 || (int)i < curDiff.blank[file])
2114 // set diff or trivial flag
2115 DWORD dflag = (curDiff.op == OP_TRIVIAL) ? LF_TRIVIAL : LF_DIFF;
2116 if ((file == 0 && curDiff.op == OP_3RDONLY) || (file == 2 && curDiff.op == OP_1STONLY))
2118 m_ptBuf[file]->SetLineFlag(i, dflag, true, false, false);
2119 m_ptBuf[file]->SetLineFlag(i, LF_INVISIBLE, false, false, false);
2123 // ghost lines are already inserted (and flagged)
2124 // ghost lines opposite to trivial lines are ghost and trivial
2125 if (curDiff.op == OP_TRIVIAL)
2126 m_ptBuf[file]->SetLineFlag(i, LF_TRIVIAL, true, false, false);
2132 } // switch (curDiff.op)
2133 VERIFY(m_diffList.SetDiff(nDiff, curDiff));
2134 } // for (nDiff = nDiffCount; nDiff-- > 0; )
2136 m_diffList.ConstructSignificantChain();
2139 // Note: By this point all `m_ptBuf[]` buffers must have the same
2140 // number of line entries; eventual buffer processing typically
2141 // uses the line count from `m_ptBuf[0]` for all buffer processing.
2143 for (file = 0; file < m_nBuffers; file++)
2145 ASSERT(m_ptBuf[0]->GetLineCount() == m_ptBuf[file]->GetLineCount());
2149 for (file = 0; file < m_nBuffers; file++)
2150 m_ptBuf[file]->FinishLoading();
2154 * @brief Checks if file has changed since last update (save or rescan).
2155 * @param [in] szPath File to check
2156 * @param [in] dfi Previous fileinfo of file
2157 * @param [in] bSave If true Compare to last save-info, else to rescan-info
2158 * @param [in] nBuffer Index (0-based) of buffer
2159 * @return true if file is changed.
2161 CMergeDoc::FileChange CMergeDoc::IsFileChangedOnDisk(LPCTSTR szPath, DiffFileInfo &dfi,
2162 bool bSave, int nBuffer)
2164 DiffFileInfo *fileInfo = nullptr;
2165 bool bFileChanged = false;
2166 bool bIgnoreSmallDiff = GetOptionsMgr()->GetBool(OPT_IGNORE_SMALL_FILETIME);
2168 if (bIgnoreSmallDiff)
2169 tolerance = SmallTimeDiff; // From MainFrm.h
2172 fileInfo = m_pSaveFileInfo[nBuffer].get();
2174 fileInfo = m_pRescanFileInfo[nBuffer].get();
2176 // We assume file existed, so disappearing means removal
2177 if (!dfi.Update(szPath))
2180 int64_t timeDiff = dfi.mtime - fileInfo->mtime;
2181 if (timeDiff < 0) timeDiff = -timeDiff;
2182 if ((timeDiff > tolerance * Poco::Timestamp::resolution()) || (dfi.size != fileInfo->size))
2184 bFileChanged = true;
2190 return FileNoChange;
2193 void CMergeDoc::HideLines()
2198 if (m_nDiffContext < 0)
2200 ForEachView([](auto& pView) { pView->SetEnableHideLines(false); });
2204 int nLineCount = 0x7fffffff;
2205 for (file = 0; file < m_nBuffers; file++)
2207 if (nLineCount > m_ptBuf[file]->GetLineCount())
2208 nLineCount = m_ptBuf[file]->GetLineCount();
2211 for (nLine = 0; nLine < nLineCount;)
2213 if (!(m_ptBuf[0]->GetLineFlags(nLine) & (LF_DIFF | LF_GHOST)))
2215 for (file = 0; file < m_nBuffers; file++)
2216 m_ptBuf[file]->SetLineFlag(nLine, LF_INVISIBLE, true, false, false);
2221 int nLine2 = (nLine - m_nDiffContext < 0) ? 0 : (nLine - m_nDiffContext);
2222 for (; nLine2 < nLine; nLine2++)
2224 for (file = 0; file < m_nBuffers; file++)
2225 m_ptBuf[file]->SetLineFlag(nLine2, LF_INVISIBLE, false, false, false);
2228 for (; nLine < nLineCount; nLine++)
2230 if (!(m_ptBuf[0]->GetLineFlags(nLine) & (LF_DIFF | LF_GHOST)))
2232 for (file = 0; file < m_nBuffers; file++)
2233 m_ptBuf[file]->SetLineFlag(nLine, LF_INVISIBLE, false, false, false);
2236 int nLineEnd2 = (nLine + m_nDiffContext >= nLineCount) ? nLineCount-1 : (nLine + m_nDiffContext);
2237 for (; nLine < nLineEnd2; nLine++)
2239 for (file = 0; file < m_nBuffers; file++)
2240 m_ptBuf[file]->SetLineFlag(nLine, LF_INVISIBLE, false, false, false);
2241 if (m_ptBuf[0]->GetLineFlags(nLine) & (LF_DIFF | LF_GHOST))
2242 nLineEnd2 = (nLine + 1 + m_nDiffContext >= nLineCount) ? nLineCount-1 : (nLine + 1 + m_nDiffContext);
2247 ForEachView([](auto& pView) { pView->SetEnableHideLines(true); });
2251 * @brief Asks and then saves modified files.
2253 * This function saves modified files. Dialog is shown for user to select
2254 * modified file(s) one wants to save or discard changed. Cancelling of
2255 * save operation is allowed unless denied by parameter. After successfully
2256 * save operation file statuses are updated to directory compare.
2257 * @param [in] bAllowCancel If false "Cancel" button is disabled.
2258 * @return true if user selected "OK" so next operation can be
2259 * executed. If false user choosed "Cancel".
2260 * @note If filename is empty, we assume scratchpads are saved,
2261 * so instead of filename, description is shown.
2262 * @todo If we have filename and description for file, what should
2263 * we do after saving to different filename? Empty description?
2264 * @todo Parameter @p bAllowCancel is always true in callers - can be removed.
2266 bool CMergeDoc::PromptAndSaveIfNeeded(bool bAllowCancel)
2268 bool bLModified = false, bMModified = false, bRModified = false;
2270 bool bLSaveSuccess = false, bMSaveSuccess = false, bRSaveSuccess = false;
2272 if (m_nBuffers == 3)
2274 bLModified = m_ptBuf[0]->IsModified();
2275 bMModified = m_ptBuf[1]->IsModified();
2276 bRModified = m_ptBuf[2]->IsModified();
2280 bLModified = m_ptBuf[0]->IsModified();
2281 bRModified = m_ptBuf[1]->IsModified();
2283 if (!bLModified && !bMModified && !bRModified)
2287 dlg.DoAskFor(bLModified, bMModified, bRModified);
2289 dlg.m_bDisableCancel = true;
2290 if (!m_filePaths.GetLeft().empty())
2292 if (theApp.m_strSaveAsPath.empty())
2293 dlg.m_sLeftFile = m_filePaths.GetLeft();
2295 dlg.m_sLeftFile = theApp.m_strSaveAsPath;
2298 dlg.m_sLeftFile = m_strDesc[0];
2299 if (m_nBuffers == 3)
2301 if (!m_filePaths.GetMiddle().empty())
2303 if (theApp.m_strSaveAsPath.empty())
2304 dlg.m_sMiddleFile = m_filePaths.GetMiddle();
2306 dlg.m_sMiddleFile = theApp.m_strSaveAsPath;
2309 dlg.m_sMiddleFile = m_strDesc[1];
2311 if (!m_filePaths.GetRight().empty())
2313 if (theApp.m_strSaveAsPath.empty())
2314 dlg.m_sRightFile = m_filePaths.GetRight();
2316 dlg.m_sRightFile = theApp.m_strSaveAsPath;
2319 dlg.m_sRightFile = m_strDesc[m_nBuffers - 1];
2321 if (dlg.DoModal() == IDOK)
2323 if (bLModified && dlg.m_leftSave == SaveClosingDlg::SAVECLOSING_SAVE)
2325 if (!DoSave(m_filePaths.GetLeft().c_str(), bLSaveSuccess, 0))
2329 if (bMModified && dlg.m_middleSave == SaveClosingDlg::SAVECLOSING_SAVE)
2331 if (!DoSave(m_filePaths.GetMiddle().c_str(), bMSaveSuccess, 1))
2335 if (bRModified && dlg.m_rightSave == SaveClosingDlg::SAVECLOSING_SAVE)
2337 if (!DoSave(m_filePaths.GetRight().c_str(), bRSaveSuccess, m_nBuffers - 1))
2346 // If file were modified and saving was successfull,
2347 // update status on dir view
2348 if ((bLModified && bLSaveSuccess) ||
2349 (bMModified && bMSaveSuccess) ||
2350 (bRModified && bRSaveSuccess))
2352 // If directory compare has results
2353 if (m_pDirDoc != nullptr && m_pDirDoc->HasDiffs())
2355 if (m_bEditAfterRescan[0] || m_bEditAfterRescan[1] || (m_nBuffers == 3 && m_bEditAfterRescan[2]))
2356 FlushAndRescan(false);
2358 bool bIdentical = !m_diffList.HasSignificantDiffs(); // True if status should be set to identical
2359 m_pDirDoc->UpdateChangedItem(m_filePaths, m_diffList.GetSignificantDiffs(),
2360 m_nTrivialDiffs, bIdentical);
2367 /** Rescan only if we did not Rescan during the last timeOutInSecond seconds*/
2368 void CMergeDoc::RescanIfNeeded(float timeOutInSecond)
2370 // if we did not rescan during the request timeOut, Rescan
2371 // else we did Rescan after the request, so do nothing
2372 COleDateTimeSpan elapsed = COleDateTime::GetCurrentTime() - m_LastRescan;
2373 if (elapsed.GetTotalSeconds() >= timeOutInSecond)
2374 // (laoran 08-01-2003) maybe should be FlushAndRescan(true) ??
2379 * @brief We have two child views (left & right), so we keep pointers directly
2380 * at them (the MFC view list doesn't have them both)
2382 void CMergeDoc::AddMergeViews(CMergeEditView *pView[3])
2385 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2386 m_pView[m_nGroups][nBuffer] = pView[nBuffer];
2390 void CMergeDoc::RemoveMergeViews(int nGroup)
2393 for (; nGroup < m_nGroups - 1; nGroup++)
2395 for (int nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2397 m_pView[nGroup][nBuffer] = m_pView[nGroup + 1][nBuffer];
2398 m_pView[nGroup][nBuffer]->m_nThisGroup = nGroup;
2405 * @brief DirDoc gives us its identity just after it creates us
2407 void CMergeDoc::SetDirDoc(CDirDoc * pDirDoc)
2409 ASSERT(pDirDoc != nullptr && m_pDirDoc == nullptr);
2410 m_pDirDoc = pDirDoc;
2414 * @brief Return pointer to parent frame
2416 CMergeEditFrame * CMergeDoc::GetParentFrame()
2418 return dynamic_cast<CMergeEditFrame *>(m_pView[0][0]->GetParentFrame());
2422 * @brief DirDoc is closing
2424 void CMergeDoc::DirDocClosing(CDirDoc * pDirDoc)
2426 ASSERT(m_pDirDoc == pDirDoc);
2427 m_pDirDoc = nullptr;
2428 // TODO (Perry 2003-03-30): perhaps merge doc should close now ?
2432 * @brief DirDoc commanding us to close
2434 bool CMergeDoc::CloseNow()
2436 // Allow user to cancel closing
2437 if (!PromptAndSaveIfNeeded(true))
2440 GetParentFrame()->CloseNow();
2445 * @brief Loads file to buffer and shows load-errors
2446 * @param [in] sFileName File to open
2447 * @param [in] nBuffer Index (0-based) of buffer to load
2448 * @param [out] readOnly whether file is read-only
2449 * @param [in] encoding encoding used
2450 * @return Tells if files were loaded successfully
2451 * @sa CMergeDoc::OpenDocs()
2453 int CMergeDoc::LoadFile(CString sFileName, int nBuffer, bool & readOnly, const FileTextEncoding & encoding)
2456 DWORD retVal = FileLoadResult::FRESULT_ERROR;
2458 CDiffTextBuffer *pBuf = m_ptBuf[nBuffer].get();
2459 m_filePaths[nBuffer] = sFileName;
2461 CRLFSTYLE nCrlfStyle = CRLF_STYLE_AUTOMATIC;
2463 retVal = pBuf->LoadFromFile(sFileName, m_pInfoUnpacker.get(),
2464 m_strBothFilenames.c_str(), readOnly, nCrlfStyle, encoding, sOpenError);
2466 // if CMergeDoc::CDiffTextBuffer::LoadFromFile failed,
2467 // it left the pBuf in a valid (but empty) state via a call to InitNew
2469 if (FileLoadResult::IsOkImpure(retVal))
2471 // File loaded, and multiple EOL types in this file
2472 FileLoadResult::SetMainOk(retVal);
2474 // If mixed EOLs are not enabled, enable them for this doc.
2475 if (!GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL))
2477 pBuf->SetMixedEOL(true);
2481 if (FileLoadResult::IsError(retVal))
2483 // Error from Unifile/system
2484 if (!sOpenError.IsEmpty())
2485 sError = strutils::format_string2(_("Cannot open file\n%1\n\n%2"), (LPCTSTR)sFileName, (LPCTSTR)sOpenError);
2487 sError = strutils::format_string1(_("File not found: %1"), (LPCTSTR)sFileName);
2488 ShowMessageBox(sError, MB_OK | MB_ICONSTOP | MB_MODELESS);
2490 else if (FileLoadResult::IsErrorUnpack(retVal))
2492 sError = strutils::format_string1(_("File not unpacked: %1"), (LPCTSTR)sFileName);
2493 ShowMessageBox(sError, MB_OK | MB_ICONSTOP | MB_MODELESS);
2499 * @brief Check if specified codepage number is valid for WinMerge Editor.
2500 * @param [in] cp Codepage number to check.
2501 * @return true if codepage is valid, false otherwise.
2503 bool CMergeDoc::IsValidCodepageForMergeEditor(unsigned cp) const
2505 if (cp == 0) // 0 is our signal value for invalid
2507 return GetEncodingNameFromCodePage(cp) != nullptr;
2511 * @brief Sanity check file's specified codepage.
2512 * This function checks if file's specified codepage is valid for WinMerge
2513 * editor and if not resets the codepage to default.
2514 * @param [in,out] fileinfo Class containing file's codepage.
2516 void CMergeDoc::SanityCheckCodepage(FileLocation & fileinfo)
2518 if (fileinfo.encoding.m_unicoding == ucr::NONE
2519 && !IsValidCodepageForMergeEditor(fileinfo.encoding.m_codepage))
2521 int cp = ucr::getDefaultCodepage();
2522 if (!IsValidCodepageForMergeEditor(cp))
2524 fileinfo.encoding.SetCodepage(cp);
2529 * @brief Loads one file from disk and updates file infos.
2530 * @param [in] index Index of file in internal buffers.
2531 * @param [in] filename File's name.
2532 * @param [in] readOnly Is file read-only?
2533 * @param [in] encoding File's encoding.
2534 * @return One of FileLoadResult values.
2536 DWORD CMergeDoc::LoadOneFile(int index, String filename, bool readOnly, const String& strDesc,
2537 const FileTextEncoding & encoding)
2539 DWORD loadSuccess = FileLoadResult::FRESULT_ERROR;;
2541 m_strDesc[index] = strDesc;
2542 if (!filename.empty())
2544 if (strDesc.empty())
2545 m_nBufferType[index] = BUFFER_NORMAL;
2547 m_nBufferType[index] = BUFFER_NORMAL_NAMED;
2548 m_pSaveFileInfo[index]->Update(filename);
2549 m_pRescanFileInfo[index]->Update(filename);
2551 loadSuccess = LoadFile(filename.c_str(), index, readOnly, encoding);
2552 if (FileLoadResult::IsLossy(loadSuccess))
2554 m_ptBuf[index]->FreeAll();
2555 loadSuccess = LoadFile(filename.c_str(), index, readOnly,
2556 GuessCodepageEncoding(filename, GetOptionsMgr()->GetInt(OPT_CP_DETECT), -1));
2561 m_nBufferType[index] = BUFFER_UNNAMED;
2562 m_ptBuf[index]->InitNew();
2563 m_ptBuf[index]->m_encoding = encoding;
2564 m_ptBuf[index]->FinishLoading(); // should clear GGhostTextBuffer::m_RealityBlock when reloading unnamed buffer
2565 loadSuccess = FileLoadResult::FRESULT_OK;
2571 * @brief Loads files and does initial rescan.
2572 * @param fileloc [in] File to open to left/middle/right side (path & encoding info)
2573 * @param bRO [in] Is left/middle/right file read-only
2574 * @return Success/Failure/Binary (failure) per typedef enum OpenDocsResult_TYPE
2575 * @todo Options are still read from CMainFrame, this will change
2576 * @sa CMainFrame::ShowMergeDoc()
2578 bool CMergeDoc::OpenDocs(int nFiles, const FileLocation ifileloc[],
2579 const bool bRO[], const String strDesc[])
2581 IDENTLEVEL identical = IDENTLEVEL_NONE;
2582 int nRescanResult = RESCAN_OK;
2584 FileLocation fileloc[3];
2586 std::copy_n(ifileloc, 3, fileloc);
2588 // Filter out invalid codepages, or editor will display all blank
2589 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2590 SanityCheckCodepage(fileloc[nBuffer]);
2594 curUndo = undoTgt.begin();
2596 // Prevent displaying views during LoadFile
2597 // Note : attach buffer again only if both loads succeed
2598 m_strBothFilenames.erase();
2600 ForEachView([](auto& pView) { pView->DetachFromBuffer(); });
2602 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2604 // clear undo buffers
2605 m_ptBuf[nBuffer]->m_aUndoBuf.clear();
2608 m_ptBuf[nBuffer]->FreeAll ();
2610 // build the text being filtered, "|" separates files as it is forbidden in filenames
2611 m_strBothFilenames += fileloc[nBuffer].filepath + _T("|");
2613 m_strBothFilenames.erase(m_strBothFilenames.length() - 1);
2617 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2619 nSuccess[nBuffer] = LoadOneFile(nBuffer, fileloc[nBuffer].filepath, bRO[nBuffer], strDesc ? strDesc[nBuffer] : _T(""),
2620 fileloc[nBuffer].encoding);
2622 const bool bFiltersEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
2624 // scratchpad : we don't call LoadFile, so
2625 // we need to initialize the unpacker as a "do nothing" one
2626 if (bFiltersEnabled)
2628 if (std::count(m_nBufferType, m_nBufferType + m_nBuffers, BUFFER_UNNAMED) == m_nBuffers)
2630 m_pInfoUnpacker->Initialize(PLUGIN_MANUAL);
2634 // Bail out if either side failed
2635 if (std::find_if(nSuccess, nSuccess + m_nBuffers, [](DWORD d){return !FileLoadResult::IsOk(d);} ) != nSuccess + m_nBuffers)
2637 CMergeEditFrame *pFrame = GetParentFrame();
2638 if (pFrame != nullptr)
2640 // Use verify macro to trap possible error in debug.
2641 VERIFY(pFrame->DestroyWindow());
2646 // Warn user if file load was lossy (bad encoding)
2648 int nLossyBuffers = 0;
2649 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2651 if (FileLoadResult::IsLossy(nSuccess[nBuffer]))
2653 // TODO: It would be nice to report how many lines were lossy
2654 // we did calculate those numbers when we loaded the files, in the text stats
2656 idres = IDS_LOSSY_TRANSCODING_FIRST + nBuffer;
2660 if (nLossyBuffers > 1)
2661 idres = IDS_LOSSY_TRANSCODING_BOTH; /* FIXEME */
2663 if (nLossyBuffers > 0)
2665 if (m_pEncodingErrorBar == nullptr)
2667 m_pEncodingErrorBar.reset(new CEncodingErrorBar());
2668 m_pEncodingErrorBar->Create(this->m_pView[0][0]->GetParentFrame());
2670 m_pEncodingErrorBar->SetText(LoadResString(idres));
2671 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), TRUE, FALSE);
2674 ForEachView([](auto& pView) {
2675 // Now buffers data are valid
2676 pView->AttachToBuffer();
2677 // Currently there is only one set of syntax colors, which all documents & views share
2678 pView->SetColorContext(theApp.GetMainSyntaxColors());
2679 // Currently there is only one set of markers, which all documents & views share
2680 pView->SetMarkersContext(theApp.GetMainMarkers());
2682 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2684 // Set read-only statuses
2685 m_ptBuf[nBuffer]->SetReadOnly(bRO[nBuffer]);
2688 // Check the EOL sensitivity option (do it before Rescan)
2689 DIFFOPTIONS diffOptions = {0};
2690 m_diffWrapper.GetOptions(&diffOptions);
2691 if (!GetOptionsMgr()->GetBool(OPT_ALLOW_MIXED_EOL) && !diffOptions.bIgnoreEol)
2693 for (nBuffer = 1; nBuffer < m_nBuffers; nBuffer++)
2694 if (m_ptBuf[0]->GetCRLFMode() != m_ptBuf[nBuffer]->GetCRLFMode())
2697 if (nBuffer < m_nBuffers)
2699 // Options and files not are not compatible :
2700 // Sensitive to EOL on, allow mixing EOL off, and files have a different EOL style.
2701 // All lines will differ, that is not very interesting and probably not wanted.
2702 // Propose to turn off the option 'sensitive to EOL'
2703 String s = theApp.LoadString(IDS_SUGGEST_IGNOREEOL);
2704 if (ShowMessageBox(s, MB_YESNO | MB_ICONWARNING | MB_DONT_ASK_AGAIN | MB_IGNORE_IF_SILENCED, IDS_SUGGEST_IGNOREEOL) == IDYES)
2706 diffOptions.bIgnoreEol = true;
2707 m_diffWrapper.SetOptions(&diffOptions);
2712 // Define the prediffer
2713 PackingInfo * infoUnpacker = nullptr;
2714 PrediffingInfo * infoPrediffer = nullptr;
2715 if (bFiltersEnabled && m_pDirDoc != nullptr)
2717 m_pDirDoc->GetPluginManager().FetchPluginInfos(m_strBothFilenames, &infoUnpacker, &infoPrediffer);
2718 m_diffWrapper.SetPrediffer(infoPrediffer);
2719 m_diffWrapper.SetTextForAutomaticPrediff(m_strBothFilenames);
2722 bool bBinary = false;
2723 nRescanResult = Rescan(bBinary, identical);
2725 // Open filed if rescan succeed and files are not binaries
2726 if (nRescanResult == RESCAN_OK)
2728 // set the document types
2729 // Warning : it is the first thing to do (must be done before UpdateView,
2730 // or any function that calls UpdateView, like SelectDiff)
2731 // Note: If option enabled, and another side type is not recognized,
2732 // we use recognized type for unrecognized side too.
2737 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2739 if (bFiltersEnabled && m_pInfoUnpacker->m_textType.length())
2740 sext[nBuffer] = m_pInfoUnpacker->m_textType;
2742 sext[nBuffer] = GetFileExt(fileloc[nBuffer].filepath.c_str(), m_strDesc[nBuffer].c_str());
2743 ForEachView(nBuffer, [&](auto& pView) {
2744 bTyped[nBuffer] = pView->SetTextType(sext[nBuffer].c_str());
2745 if (bTyped[nBuffer])
2746 paneTyped = nBuffer;
2750 for (nBuffer = 1; nBuffer < m_nBuffers; nBuffer++)
2752 if (bTyped[0] != bTyped[nBuffer])
2756 bool syntaxHLEnabled = GetOptionsMgr()->GetBool(OPT_SYNTAX_HIGHLIGHT);
2757 if (syntaxHLEnabled && nBuffer < m_nBuffers)
2759 if (std::count(bTyped, bTyped + m_nBuffers, false) == m_nBuffers)
2762 m_ptBuf[0]->GetLine(0, sFirstLine);
2763 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2765 bTyped[nBuffer] = GetView(0, nBuffer)->SetTextTypeByContent(sFirstLine);
2770 if (syntaxHLEnabled)
2772 CCrystalTextView::TextDefinition *enuType = GetView(0, paneTyped)->GetTextType(sext[paneTyped].c_str());
2773 ForEachView([&bTyped, enuType](auto& pView) {
2774 if (!bTyped[pView->m_nThisPane])
2775 pView->SetTextType(enuType);
2779 int nNormalBuffer = 0;
2780 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
2782 // set the frame window header
2783 UpdateHeaderPath(nBuffer);
2785 ForEachView(nBuffer, [](auto& pView) { pView->DocumentsLoaded(); });
2787 if ((m_nBufferType[nBuffer] == BUFFER_NORMAL) ||
2788 (m_nBufferType[nBuffer] == BUFFER_NORMAL_NAMED))
2795 // Inform user that files are identical
2796 // Don't show message if new buffers created
2797 if (identical == IDENTLEVEL_ALL && nNormalBuffer > 0)
2799 ShowRescanError(nRescanResult, identical);
2802 // Exit if files are identical should only work for the first
2803 // comparison and must be disabled afterward.
2804 theApp.m_bExitIfNoDiff = MergeCmdLineInfo::Disabled;
2808 // CMergeDoc::Rescan fails if files do not exist on both sides
2809 // or the really arcane case that the temp files couldn't be created,
2810 // which is too obscure to bother reporting if you can't write to
2811 // your temp directory, doing nothing is graceful enough for that).
2812 ShowRescanError(nRescanResult, identical);
2813 GetParentFrame()->DestroyWindow();
2817 // Force repaint of location pane to update it in case we had some warning
2818 // dialog visible and it got painted before files were loaded
2819 if (m_pView[0][0] != nullptr)
2820 m_pView[0][0]->RepaintLocationPane();
2825 void CMergeDoc::MoveOnLoad(int nPane, int nLineIndex)
2829 nPane = GetOptionsMgr()->GetInt(OPT_ACTIVE_PANE);
2830 if (nPane < 0 || nPane >= m_nBuffers)
2833 if (nLineIndex == -1)
2835 // scroll to first diff
2836 if (GetOptionsMgr()->GetBool(OPT_SCROLL_TO_FIRST) &&
2837 m_diffList.HasSignificantDiffs())
2839 int nDiff = m_diffList.FirstSignificantDiff();
2840 m_pView[0][nPane]->SelectDiff(nDiff, true, false);
2841 nLineIndex = m_pView[0][nPane]->GetCursorPos().y;
2844 if (nLineIndex != -1)
2845 m_pView[0][nPane]->GotoLine(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 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), FALSE, FALSE);
3140 DoFileEncodingDialog();
3143 void CMergeDoc::OnBnClickedPlugin()
3145 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), FALSE, FALSE);
3146 OpenWithUnpackerDialog();
3149 void CMergeDoc::OnBnClickedHexView()
3151 OnFileRecompareAs(ID_MERGE_COMPARE_HEX);
3154 void CMergeDoc::OnOK()
3156 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), FALSE, FALSE);
3159 void CMergeDoc::OnFileRecompareAsText()
3161 PackingInfo infoUnpacker;
3162 SetUnpacker(&infoUnpacker);
3166 void CMergeDoc::OnUpdateFileRecompareAsText(CCmdUI *pCmdUI)
3168 pCmdUI->Enable(m_pInfoUnpacker->m_PluginOrPredifferMode == PLUGIN_BUILTIN_XML);
3171 void CMergeDoc::OnFileRecompareAsXML()
3173 PackingInfo infoUnpacker(PLUGIN_BUILTIN_XML);
3174 SetUnpacker(&infoUnpacker);
3178 void CMergeDoc::OnUpdateFileRecompareAsXML(CCmdUI *pCmdUI)
3180 pCmdUI->Enable(m_pInfoUnpacker->m_PluginOrPredifferMode != PLUGIN_BUILTIN_XML);
3183 void CMergeDoc::OnFileRecompareAs(UINT nID)
3185 DWORD dwFlags[3] = { 0 };
3186 FileLocation fileloc[3];
3187 for (int pane = 0; pane < m_nBuffers; pane++)
3189 fileloc[pane].setPath(m_filePaths[pane]);
3190 dwFlags[pane] |= FFILEOPEN_NOMRU | (m_ptBuf[pane]->GetReadOnly() ? FFILEOPEN_READONLY : 0);
3192 if (m_pEncodingErrorBar!=nullptr && m_pEncodingErrorBar->IsWindowVisible())
3193 m_pView[0][0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), FALSE, FALSE);
3194 if (nID == ID_MERGE_COMPARE_HEX)
3195 GetMainFrame()->ShowHexMergeDoc(m_pDirDoc, m_nBuffers, fileloc, dwFlags, m_strDesc);
3197 GetMainFrame()->ShowImgMergeDoc(m_pDirDoc, m_nBuffers, fileloc, dwFlags, m_strDesc);
3198 GetParentFrame()->ShowWindow(SW_RESTORE);
3199 GetParentFrame()->DestroyWindow();
3202 // Return file extension either from file name
3203 String CMergeDoc::GetFileExt(LPCTSTR sFileName, LPCTSTR sDescription) const
3206 paths::SplitFilename(sFileName, nullptr, nullptr, &sExt);
3211 * @brief Generate report from file compare results.
3213 bool CMergeDoc::GenerateReport(const String& sFileName) const
3215 // calculate HTML font size
3218 dc.CreateDC(_T("DISPLAY"), nullptr, nullptr, nullptr);
3219 m_pView[0][0]->GetFont(lf);
3220 int nFontSize = -MulDiv (lf.lfHeight, 72, dc.GetDeviceCaps (LOGPIXELSY));
3222 // create HTML report
3224 if (!file.Open(sFileName, _T("wt")))
3226 String errMsg = GetSysError(GetLastError());
3227 String msg = strutils::format_string1(
3228 _("Error creating the report:\n%1"), errMsg);
3229 AfxMessageBox(msg.c_str(), MB_OK | MB_ICONSTOP);
3233 file.SetCodepage(ucr::CP_UTF_8);
3235 CString headerText =
3236 _T("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n")
3237 _T("\t\"http://www.w3.org/TR/html4/loose.dtd\">\n")
3240 _T("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n")
3241 _T("<title>WinMerge File Compare Report</title>\n")
3242 _T("<style type=\"text/css\">\n")
3244 _T("table {margin: 0; border: 1px solid #a0a0a0; box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.15);}\n")
3245 _T("td,th {word-break: break-all; font-size: %dpt;padding: 0 3px;}\n")
3246 _T("tr { vertical-align: top; }\n")
3247 _T(".ln {text-align: right; word-break: normal; background-color: lightgrey;}\n")
3248 _T(".title {color: white; background-color: blue; vertical-align: top; padding: 4px 4px; background: linear-gradient(mediumblue, darkblue);}\n")
3254 _T("<table cellspacing=\"0\" cellpadding=\"0\" style=\"width:100%%;\">\n")
3258 strutils::format((LPCTSTR)headerText, nFontSize, (LPCTSTR)m_pView[0][0]->GetHTMLStyles());
3259 file.WriteString(header);
3262 // If archive, use archive path + folder + filename inside archive
3263 // If desc text given, use it
3264 PathContext paths = m_filePaths;
3265 if (m_pDirDoc != nullptr && m_pDirDoc->IsArchiveFolders())
3267 for (int i = 0; i < paths.GetSize(); i++)
3268 m_pDirDoc->ApplyDisplayRoot(i, paths[i]);
3272 for (int i = 0; i < paths.GetSize(); i++)
3274 if (!m_strDesc[i].empty())
3275 paths[i] = m_strDesc[i];
3281 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3283 String data = strutils::format(_T("<th colspan=\"2\" class=\"title\" style=\"width:%f%%\">"),
3284 (double)100 / m_nBuffers);
3285 file.WriteString(data);
3286 file.WriteString(ucr::toTString(CMarkdown::Entities(ucr::toUTF8(paths[nBuffer]))));
3287 file.WriteString(_T("</th>\n"));
3294 // write the body of the report
3296 int nLineCount[3] = {0};
3298 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3299 nLineCount[nBuffer] = m_ptBuf[nBuffer]->GetLineCount();
3303 file.WriteString(_T("<tr>\n"));
3304 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3306 for (; idx[nBuffer] < nLineCount[nBuffer]; idx[nBuffer]++)
3308 if (m_pView[0][nBuffer]->GetLineVisible(idx[nBuffer]))
3312 if (idx[nBuffer] < nLineCount[nBuffer])
3315 int iVisibleLineNumber = 0;
3316 String tdtag = _T("<td class=\"ln\">");
3317 DWORD dwFlags = m_ptBuf[nBuffer]->GetLineFlags(idx[nBuffer]);
3318 if ((dwFlags & LF_GHOST) == 0 && m_pView[0][nBuffer]->GetViewLineNumbers())
3320 iVisibleLineNumber = m_ptBuf[nBuffer]->ComputeRealLine(idx[nBuffer]) + 1;
3323 (dwFlags & (LF_DIFF | LF_GHOST)) != 0 && (idx[nBuffer] == 0 ||
3324 (m_ptBuf[nBuffer]->GetLineFlags(idx[nBuffer] - 1) & (LF_DIFF | LF_GHOST)) == 0))
3327 if (iVisibleLineNumber > 0)
3329 tdtag += strutils::format(_T("<a name=\"d%d\" href=\"#d%d\">%d</a>"), nDiff, nDiff, iVisibleLineNumber);
3330 iVisibleLineNumber = 0;
3333 tdtag += strutils::format(_T("<a name=\"d%d\" href=\"#d%d\">.</a>"), nDiff, nDiff);
3335 if (iVisibleLineNumber > 0)
3336 tdtag += strutils::format(_T("%d</td>"), iVisibleLineNumber);
3338 tdtag += _T("</td>");
3339 file.WriteString(tdtag);
3341 file.WriteString((LPCTSTR)m_pView[0][nBuffer]->GetHTMLLine(idx[nBuffer], _T("td")));
3345 file.WriteString(_T("<td class=\"ln\"></td><td></td>"));
3346 file.WriteString(_T("\n"));
3348 file.WriteString(_T("</tr>\n"));
3350 bool bBorderLine = false;
3351 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3353 if (idx[nBuffer] < nLineCount[nBuffer] && !m_pView[0][nBuffer]->GetLineVisible(idx[nBuffer]))
3359 file.WriteString(_T("<tr height=1>"));
3360 for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
3362 if (idx[nBuffer] < nLineCount[nBuffer] && !m_pView[0][nBuffer]->GetLineVisible(idx[nBuffer]))
3363 file.WriteString(_T("<td style=\"background-color: black\"></td><td style=\"background-color: black\"></td>"));
3365 file.WriteString(_T("<td></td><td></td>"));
3367 file.WriteString(_T("</tr>\n"));
3370 if (idx[0] >= nLineCount[0] && idx[1] >= nLineCount[1] && (m_nBuffers < 3 || idx[2] >= nLineCount[2]))
3385 * @brief Generate report from file compare results.
3387 void CMergeDoc::OnToolsGenerateReport()
3392 if (!SelectFile(AfxGetMainWnd()->GetSafeHwnd(), s, false, folder, _T(""), _("HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"), _T("htm")))
3395 GenerateReport(s.c_str());
3397 LangMessageBox(IDS_REPORT_SUCCESS, MB_OK | MB_ICONINFORMATION);
3401 * @brief Generate patch from files selected.
3403 * Creates a patch from selected files in active directory compare, or
3404 * active file compare. Files in file compare must be saved before
3407 void CMergeDoc::OnToolsGeneratePatch()
3409 // If there are changes in files, tell user to save them first
3412 LangMessageBox(IDS_SAVEFILES_FORPATCH, MB_ICONSTOP);
3417 patcher.AddFiles(m_filePaths.GetLeft(),
3418 m_filePaths.GetRight());
3419 patcher.CreatePatch();
3423 * @brief Add synchronization point
3425 void CMergeDoc::AddSyncPoint()
3428 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3430 int tmp = m_pView[0][nBuffer]->GetCursorPos().y;
3431 nLine[nBuffer] = m_ptBuf[nBuffer]->ComputeApparentLine(m_ptBuf[nBuffer]->ComputeRealLine(tmp));
3433 if (m_ptBuf[nBuffer]->GetLineFlags(nLine[nBuffer]) & LF_INVALID_BREAKPOINT)
3434 DeleteSyncPoint(nBuffer, nLine[nBuffer], false);
3437 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3438 m_ptBuf[nBuffer]->SetLineFlag(nLine[nBuffer], LF_INVALID_BREAKPOINT, true, false);
3440 m_bHasSyncPoints = true;
3442 ForEachView([](auto& pView) { pView->SetSelectionMargin(true); });
3444 FlushAndRescan(true);
3448 * @brief Delete a synchronization point
3450 bool CMergeDoc::DeleteSyncPoint(int pane, int nLine, bool bRescan)
3452 const auto syncpoints = GetSyncPointList();
3453 for (auto syncpnt : syncpoints)
3455 if (syncpnt[pane] == nLine)
3457 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3458 m_ptBuf[nBuffer]->SetLineFlag(syncpnt[nBuffer], LF_INVALID_BREAKPOINT, false, false);
3462 if (syncpoints.size() == 1)
3463 m_bHasSyncPoints = false;
3466 FlushAndRescan(true);
3471 * @brief Clear Synchronization points
3473 void CMergeDoc::ClearSyncPoints()
3475 if (!m_bHasSyncPoints)
3478 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3480 int nLineCount = m_ptBuf[nBuffer]->GetLineCount();
3481 for (int nLine = 0; nLine < nLineCount; ++nLine)
3483 if (m_ptBuf[nBuffer]->GetLineFlags(nLine) & LF_INVALID_BREAKPOINT)
3484 m_ptBuf[nBuffer]->SetLineFlag(nLine, LF_INVALID_BREAKPOINT, false, false);
3488 m_bHasSyncPoints = false;
3490 FlushAndRescan(true);
3493 std::vector<std::vector<int> > CMergeDoc::GetSyncPointList()
3495 std::vector<std::vector<int> > list;
3496 if (!m_bHasSyncPoints)
3498 int idx[3] = {-1, -1, -1};
3499 std::vector<int> points(m_nBuffers);
3500 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3501 points[nBuffer] = m_ptBuf[nBuffer]->GetLineCount() - 1;
3502 for (int nBuffer = 0; nBuffer < m_nBuffers; ++nBuffer)
3504 int nLineCount = m_ptBuf[nBuffer]->GetLineCount();
3505 for (int nLine = 0; nLine < nLineCount; ++nLine)
3507 if (m_ptBuf[nBuffer]->GetLineFlags(nLine) & LF_INVALID_BREAKPOINT)
3510 if (static_cast<int>(list.size()) <= idx[nBuffer])
3511 list.push_back(points);
3512 list[idx[nBuffer]][nBuffer] = nLine;