|
|
@ -467,6 +467,10 @@ class MergeContext implements OverwriteContext { |
|
|
|
final List<MergeChange> changes = []; |
|
|
|
final List<MergeChange> changes = []; |
|
|
|
final List<MergeWarning> warnings = []; |
|
|
|
final List<MergeWarning> warnings = []; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int totalChanges() { |
|
|
|
|
|
|
|
return deletedObjects.length + changes.length; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
void markAsMerged(KdbxObject object) { |
|
|
|
void markAsMerged(KdbxObject object) { |
|
|
|
if (merged.containsKey(object.uuid)) { |
|
|
|
if (merged.containsKey(object.uuid)) { |
|
|
|
throw StateError( |
|
|
|
throw StateError( |
|
|
@ -499,6 +503,15 @@ class MergeContext implements OverwriteContext { |
|
|
|
].join('\n ')) |
|
|
|
].join('\n ')) |
|
|
|
.join('\n'); |
|
|
|
.join('\n'); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
String debugSummary() { |
|
|
|
|
|
|
|
return 'Changes: ${changes.length}, Deleted: ${deletedObjects.length}, Warnings: ${warnings.join(', ')}'; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@override |
|
|
|
|
|
|
|
String toString() { |
|
|
|
|
|
|
|
return '$runtimeType{${debugSummary()}'; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
class _KeysV4 { |
|
|
|
class _KeysV4 { |
|
|
|