Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-03 04:45:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

Introduce synchronize merge method

Browse source 
* Create history-based merging that keeps older data in history instead of discarding or deleting it
* Extract merge logic into the Merger class
* Allows special merge behavior
* Improve handling of deletion and changes on groups
* Enable basic change tracking while merging
* Prevent unintended timestamp changes while merging
* Handle differences in timestamp precision
* Introduce comparison operators to allow for more sophisticated comparisons (ignore special properties, ...)
* Introduce Clock class to handle datetime across the app

Merge Strategies:
* Default (use inherited/fallback method)
* Duplicate (duplicate conflicting nodes, apply all deletions)
* KeepLocal (use local values, but apply all deletions)
* KeepRemote (use remote values, but apply all deletions)
* KeepNewer (merge history only)
* Synchronize (merge history, newest value stays on top, apply all deletions)
This commit is contained in:
Jonathan White 2018-09-30 08:45:06 -04:00 • committed by Jonathan White
parent b40e5686dc
commit c1e9f45df9
43 changed files with 2777 additions and 585 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/gui/DatabaseWidget.cpp
View file

@ -36,6 +36,7 @@
#include "core/EntrySearcher.h"
#include "core/FilePath.h"
#include "core/Group.h"
#include "core/Merger.h"
#include "core/Metadata.h"
#include "core/Tools.h"
#include "format/KeePass2Reader.h"
@ -841,7 +842,8 @@ void DatabaseWidget::mergeDatabase(bool accepted)
return;
}
m_db->merge(srcDb);
Merger merger(srcDb, m_db);
merger.merge();
}
m_databaseOpenMergeWidget->clearForms();
@ -1244,7 +1246,7 @@ void DatabaseWidget::reloadDatabaseFile()
if (mb == QMessageBox::No) {
// Notify everyone the database does not match the file
emit m_db->modified();
m_db->markAsModified();
m_databaseModified = true;
// Rewatch the database file
m_fileWatcher.addPath(m_filePath);
@ -1269,7 +1271,8 @@ void DatabaseWidget::reloadDatabaseFile()
if (mb == QMessageBox::Yes) {
// Merge the old database into the new one
m_db->setEmitModified(false);
db->merge(m_db);
Merger merger(m_db, db);
merger.merge();
} else {
// Since we are accepting the new file as-is, internally mark as unmodified
// TODO: when saving is moved out of DatabaseTabWidget, this should be replaced
@ -1300,7 +1303,7 @@ void DatabaseWidget::reloadDatabaseFile()
MessageWidget::Error);
// HACK: Directly calling the database's signal
// Mark db as modified since existing data may differ from file or file was deleted
m_db->modified();
m_db->markAsModified();
}
// Rewatch the database file