mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2024-10-01 01:26:01 -04:00
c1e9f45df9
* 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)
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/*
|
|
* Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 or (at your option)
|
|
* version 3 of the License.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef KEEPASSXC_TESTCLOCK_H
|
|
#define KEEPASSXC_TESTCLOCK_H
|
|
|
|
#include "core/Clock.h"
|
|
|
|
#include <QDateTime>
|
|
|
|
class TestClock : public Clock
|
|
{
|
|
public:
|
|
TestClock(int year, int month, int day, int hour, int min, int second);
|
|
|
|
TestClock(QDateTime utcBase = QDateTime::currentDateTimeUtc());
|
|
|
|
const QDateTime& advanceSecond(int seconds);
|
|
const QDateTime& advanceMinute(int minutes);
|
|
const QDateTime& advanceHour(int hours);
|
|
const QDateTime& advanceDay(int days);
|
|
const QDateTime& advanceMonth(int months);
|
|
const QDateTime& advanceYear(int years);
|
|
|
|
static void setup(Clock* clock);
|
|
static void teardown();
|
|
|
|
protected:
|
|
QDateTime currentDateTimeUtcImpl() const;
|
|
QDateTime currentDateTimeImpl() const;
|
|
|
|
private:
|
|
QDateTime m_utcCurrent;
|
|
};
|
|
|
|
#endif // KEEPASSXC_TESTCLOCK_H
|