Fixed a problem that the file item in the folder comparison window becomes only on...

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index 31e3bc4..937d56e 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -288,47 +288,60 @@ UPDATEITEM_TYPE UpdateDiffAfterOperation(const FileActionItem & act, CDiffContex
  * @return POSITION to item, NULL if not found.
  * @note Filenames must be same, if they differ NULL is returned.
  */
-uintptr_t FindItemFromPaths(const CDiffContext& ctxt, const String& pathLeft, const String& pathRight)
+uintptr_t FindItemFromPaths(const CDiffContext& ctxt, const PathContext& paths)
 {
-       String file1 = paths::FindFileName(pathLeft);
-       String file2 = paths::FindFileName(pathRight);
+       int nBuffer;
+       String file[3], path[3], base;
+       for (nBuffer = 0; nBuffer < paths.size(); ++nBuffer)
+       {
+               String p = paths[nBuffer];
+               file[nBuffer] = paths::FindFileName(p);
+               if (file[nBuffer].empty())
+                       return 0;
+               // Path can contain (because of difftools?) '/' and '\'
+               // so for comparing purposes, convert whole path to use '\\'
+               path[nBuffer] = paths::ToWindowsPath(String(p, 0, p.length() - file[nBuffer].length())); // include trailing backslash
+               base = ctxt.GetPath(nBuffer); // include trailing backslash
+               if (path[nBuffer].compare(0, base.length(), base.c_str()) != 0)
+                       return 0;
+               path[nBuffer].erase(0, base.length()); // turn into relative path
+               if (String::size_type length = path[nBuffer].length())
+                       path[nBuffer].resize(length - 1); // remove trailing backslash
+       }
 
        // Filenames must be identical
-       if (strutils::compare_nocase(file1, file2) != 0)
-               return NULL;
-
-       String path1(pathLeft, 0, pathLeft.length() - file1.length()); // include trailing backslash
-       String path2(pathRight, 0, pathRight.length() - file2.length()); // include trailing backslash
-
-       // Path can contain (because of difftools?) '/' and '\'
-       // so for comparing purposes, convert whole path to use '\\'
-       path1 = paths::ToWindowsPath(path1);
-       path2 = paths::ToWindowsPath(path2);
-
-       String base1 = ctxt.GetLeftPath(); // include trailing backslash
-       if (path1.compare(0, base1.length(), base1.c_str()) != 0)
-               return NULL;
-       path1.erase(0, base1.length()); // turn into relative path
-       if (String::size_type length = path1.length())
-               path1.resize(length - 1); // remove trailing backslash
-
-       String base2 = ctxt.GetRightPath(); // include trailing backslash
-       if (path2.compare(0, base2.length(), base2.c_str()) != 0)
-               return NULL;
-       path2.erase(0, base2.length()); // turn into relative path
-       if (String::size_type length = path2.length())
-               path2.resize(length - 1); // remove trailing backslash
+       if (static_cast<size_t>(std::count(file, file + paths.size(), file[0])) < paths.size())
+               return 0;
 
        uintptr_t pos = ctxt.GetFirstDiffPosition();
-       while (uintptr_t currentPos = pos) // Save our current pos before getting next
+       if (paths.size() == 2)
        {
-               const DIFFITEM &di = ctxt.GetNextDiffPosition(pos);
-               if (di.diffFileInfo[0].path == path1 &&
-                       di.diffFileInfo[1].path == path2 &&
-                       di.diffFileInfo[0].filename == file1 &&
-                       di.diffFileInfo[1].filename == file2)
+               while (uintptr_t currentPos = pos) // Save our current pos before getting next
                {
-                       return currentPos;
+                       const DIFFITEM &di = ctxt.GetNextDiffPosition(pos);
+                       if (di.diffFileInfo[0].path == path[0] &&
+                               di.diffFileInfo[1].path == path[1] &&
+                               di.diffFileInfo[0].filename == file[0] &&
+                               di.diffFileInfo[1].filename == file[1])
+                       {
+                               return currentPos;
+                       }
+               }
+       }
+       else
+       {
+               while (uintptr_t currentPos = pos) // Save our current pos before getting next
+               {
+                       const DIFFITEM &di = ctxt.GetNextDiffPosition(pos);
+                       if (di.diffFileInfo[0].path == path[0] &&
+                               di.diffFileInfo[1].path == path[1] &&
+                               di.diffFileInfo[2].path == path[2] &&
+                               di.diffFileInfo[0].filename == file[0] &&
+                               di.diffFileInfo[1].filename == file[1] &&
+                               di.diffFileInfo[2].filename == file[2])
+                       {
+                               return currentPos;
+                       }
                }
        }
        return 0;

diff --git a/Src/DirActions.h b/Src/DirActions.h
index 501792c..8152c75 100644 (file)
--- a/Src/DirActions.h
+++ b/Src/DirActions.h
@@ -141,7 +141,7 @@ String FormatMenuItemStringDifferencesTo(int count, int total);
 void ConfirmActionList(const CDiffContext& ctxt, const FileActionScript & actionList);
 UPDATEITEM_TYPE UpdateDiffAfterOperation(const FileActionItem & act, CDiffContext& ctxt, DIFFITEM &di);
 
-uintptr_t FindItemFromPaths(const CDiffContext& ctxt, const String& pathLeft, const String& pathRight);
+uintptr_t FindItemFromPaths(const CDiffContext& ctxt, const PathContext& paths);
 
 bool IsItemCopyable(const DIFFITEM & di, int index);
 bool IsItemDeletable(const DIFFITEM & di, int index);

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index d8dcf03..6253c7a 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -432,10 +432,26 @@ BOOL CDirDoc::CloseMergeDocs()
 void CDirDoc::UpdateChangedItem(PathContext &paths,
        UINT nDiffs, UINT nTrivialDiffs, BOOL bIdentical)
 {
-       uintptr_t pos = FindItemFromPaths(*m_pCtxt, paths.GetLeft(), paths.GetRight());
+       uintptr_t pos = FindItemFromPaths(*m_pCtxt, paths);
        // If we failed files could have been swapped so lets try again
        if (!pos)
-               pos = FindItemFromPaths(*m_pCtxt, paths.GetRight(), paths.GetLeft());
+       {
+               PathContext pathsSwapped(paths);
+               std::swap(paths[0], paths[static_cast<int>(paths.size() - 1)]);
+               pos = FindItemFromPaths(*m_pCtxt, pathsSwapped);
+               if (!pos && paths.size() > 2)
+               {
+                       pathsSwapped = paths;
+                       std::swap(paths[0], paths[1]);
+                       pos = FindItemFromPaths(*m_pCtxt, pathsSwapped);
+                       if (!pos && paths.size() > 2)
+                       {
+                               pathsSwapped = paths;
+                               std::swap(paths[1], paths[2]);
+                               pos = FindItemFromPaths(*m_pCtxt, pathsSwapped);
+                       }
+               }
+       }
        
        // Update status if paths were found for items.
        // Fail means we had unique items compared as 'renamed' items

diff --git a/Src/HexMergeDoc.cpp b/Src/HexMergeDoc.cpp
index 627d08e..f6363d0 100644 (file)
--- a/Src/HexMergeDoc.cpp
+++ b/Src/HexMergeDoc.cpp
@@ -68,7 +68,7 @@ static void UpdateDiffItem(int nBuffers, DIFFITEM &di, CDiffContext *pCtxt)
        {
                di.diffFileInfo[nBuffer].ClearPartial();
                if (pCtxt->UpdateInfoFromDiskHalf(di, nBuffer))
-                       di.diffcode.diffcode |= DIFFCODE::FIRST << nBuffers;
+                       di.diffcode.diffcode |= DIFFCODE::FIRST << nBuffer;
        }
        // Clear flags
        di.diffcode.diffcode &= ~(DIFFCODE::TEXTFLAGS | DIFFCODE::COMPAREFLAGS | DIFFCODE::COMPAREFLAGS3WAY);
@@ -162,10 +162,8 @@ int CHexMergeDoc::UpdateDiffItem(CDirDoc *pDirDoc)
        // If directory compare has results
        if (pDirDoc && pDirDoc->HasDiffs())
        {
-               const String &pathLeft = m_filePaths.GetLeft();
-               const String &pathRight = m_filePaths.GetRight();
                CDiffContext &ctxt = pDirDoc->GetDiffContext();
-               if (UINT_PTR pos = FindItemFromPaths(ctxt, pathLeft, pathRight))
+               if (UINT_PTR pos = FindItemFromPaths(ctxt, m_filePaths))
                {
                        DIFFITEM &di = ctxt.GetDiffRefAt(pos);
                        ::UpdateDiffItem(m_nBuffers, di, &ctxt);