Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Ring <sjr@jdns.org>2019-09-13 16:49:03 +0300
committerJonathan White <support@dmapps.us>2019-09-28 18:24:42 +0300
commitb1eda37cca4b495ffb55ce1820ae7444c496ad28 (patch)
tree1039e2c99e717190f78dfa0fe67d429cabdcfb19 /tests/TestMerge.cpp
parenta07ea12ac4ea882283dd47120dfeddadd0bcb21c (diff)
CLI: Add interactive session mode command `open`
This change adds a GNU Readline-based interactive mode to keepassxc-cli. If GNU Readline is not available, commands are just read from stdin with no editing or auto-complete support. DatabaseCommand is modified to add the path to the current database to the arguments passed to executeWithDatabase. In this way, instances of DatabaseCommand do not have to prompt to re-open the database after each invocation, and existing command implementations do not have to be changed to support interactive mode. This change also introduces a new way of handling commands between interactive and batch modes. * Fixes #3224. * Ran make format
Diffstat (limited to 'tests/TestMerge.cpp')
-rw-r--r--tests/TestMerge.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/TestMerge.cpp b/tests/TestMerge.cpp
index a682e8681..4f96d3e6d 100644
--- a/tests/TestMerge.cpp
+++ b/tests/TestMerge.cpp
@@ -1214,7 +1214,6 @@ void TestMerge::testCustomData()
QCOMPARE(dbDestination->metadata()->customData()->value("key3"),
QString("newValue")); // Old value should be replaced
-
// Merging again should not do anything if the values are the same.
m_clock->advanceSecond(1);
dbSource->metadata()->customData()->set("key3", "oldValue");
@@ -1223,7 +1222,6 @@ void TestMerge::testCustomData()
QStringList changes2 = merger2.merge();
QVERIFY(changes2.isEmpty());
-
Merger merger3(dbSource2.data(), dbDestination2.data());
merger3.merge();