mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 07:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calculate diff between source files.

Browse Source
This commit is contained in:
Bartosz Taudul 2022-12-23 18:48:05 +01:00
parent 4bb0a1f1ed
commit 5a442f123e
No known key found for this signature in database
GPG Key ID: B7FE2008B7575DF3
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/TracyView.hpp
View File

@ -744,6 +744,7 @@ private:
bool diffDone = false; bool diffDone = false;
std::vector<const char*> thisUnique; std::vector<const char*> thisUnique;
std::vector<const char*> secondUnique; std::vector<const char*> secondUnique;
std::vector<std::pair<const char*, std::string>> diffs;
void ResetSelection() void ResetSelection()
{ {
@ -768,6 +769,7 @@ private:
diffDone = false; diffDone = false;
thisUnique.clear(); thisUnique.clear();
secondUnique.clear(); secondUnique.clear();
diffs.clear();
} }
} m_compare; } m_compare;

12
server/TracyView_Compare.cpp
View File

@ -1,4 +1,7 @@
#include <numeric> #include <numeric>
#include <sstream>
#include "../dtl/dtl.hpp"
#include "TracyImGui.hpp" #include "TracyImGui.hpp"
#include "TracyFileRead.hpp" #include "TracyFileRead.hpp"
@ -299,6 +302,14 @@ void View::DrawCompare()
} }
else if( tv.second.len != it->second.len || memcmp( tv.second.data, it->second.data, tv.second.len ) != 0 ) else if( tv.second.len != it->second.len || memcmp( tv.second.data, it->second.data, tv.second.len ) != 0 )
{ {
auto src0 = SplitLines( tv.second.data, tv.second.len );
auto src1 = SplitLines( it->second.data, it->second.len );
dtl::Diff<std::string, std::vector<std::string>> diff { src0, src1 };
diff.compose();
diff.composeUnifiedHunks();
std::ostringstream stream;
diff.printUnifiedFormat( stream );
m_compare.diffs.emplace_back( std::make_pair( tv.first, stream.str() ) );
} }
} }
for( auto& ov : ofc ) for( auto& ov : ofc )
@ -312,6 +323,7 @@ void View::DrawCompare()
std::sort( m_compare.thisUnique.begin(), m_compare.thisUnique.end(), []( const auto& lhs, const auto& rhs ) { return strcmp( lhs, rhs ) < 0; } ); std::sort( m_compare.thisUnique.begin(), m_compare.thisUnique.end(), []( const auto& lhs, const auto& rhs ) { return strcmp( lhs, rhs ) < 0; } );
std::sort( m_compare.secondUnique.begin(), m_compare.secondUnique.end(), []( const auto& lhs, const auto& rhs ) { return strcmp( lhs, rhs ) < 0; } ); std::sort( m_compare.secondUnique.begin(), m_compare.secondUnique.end(), []( const auto& lhs, const auto& rhs ) { return strcmp( lhs, rhs ) < 0; } );
std::sort( m_compare.diffs.begin(), m_compare.diffs.end(), []( const auto& lhs, const auto& rhs ) { return strcmp( lhs.first, rhs.first ) < 0; } );
} }
} }
} }