1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
commit b849851d3317903a8ab7c040966921384d9e6508
Author: Peter Urbanec <git.user@urbanec.net>
Date: Thu May 11 16:09:12 2017 +1000
Implement most of the missing command line options
A number of command line options were missing, which caused kdiff3 from
failing to work properly when used as the mergetool in git. In particular,
git relies on the -L group of options and without those it would fail.
Signed-off-by: Peter Urbanec <git.user@urbanec.net>
diff --git a/src/main.cpp b/src/main.cpp
index 3549c92..fed486d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -67,24 +67,23 @@ int main(int argc, char *argv[])
parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("b")<<QStringLiteral("base"),i18n("Explicit base file. For compatibility with certain tools."),QStringLiteral("file")));
parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("o")<<QStringLiteral("out")<<QStringLiteral("output"),i18n("Output file. Implies -m."),QStringLiteral("file")));
parser.addOption(QCommandLineOption(QStringLiteral("auto"),i18n("No GUI if all conflicts are auto-solvable. Needs -o file.")));
+ parser.addOption(QCommandLineOption(QStringLiteral("qall"),i18n("Don't solve conflicts automatically.")));
+ parser.addOption(QCommandLineOption(QStringLiteral("L1"),i18n("Visible name replacement for input file 1 (base)."),QStringLiteral("alias1")));
+ parser.addOption(QCommandLineOption(QStringLiteral("L2"),i18n("Visible name replacement for input file 2."),QStringLiteral("alias2")));
+ parser.addOption(QCommandLineOption(QStringLiteral("L3"),i18n("Visible name replacement for input file 3."),QStringLiteral("alias3")));
+ parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("L")<<QStringLiteral("fname"),i18n("Alternative visible name replacement. Supply this once for every input."),QStringLiteral("alias")));
+ parser.addOption(QCommandLineOption(QStringLiteral("cs"),i18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""),QStringLiteral("string")));
+ parser.addOption(QCommandLineOption(QStringLiteral("confighelp"),i18n("Show list of config settings and current values.")));
parser.addPositionalArgument(QStringLiteral("file1"), i18n("File1 to open (base, if not specified via --base)."));
parser.addPositionalArgument(QStringLiteral("file2"), i18n("File2 to open."));
parser.addPositionalArgument(QStringLiteral("file3"), i18n("File3 to open (optional)."));
- aboutData.setupCommandLine(&parser);
- parser.process(app);
- aboutData.processCommandLine(&parser);
-
// TODO KF5
-// options.add( "qall", ki18n("Don't solve conflicts automatically.") );
-// options.add( "L1 alias1", ki18n("Visible name replacement for input file 1 (base).") );
-// options.add( "L2 alias2", ki18n("Visible name replacement for input file 2.") );
-// options.add( "L3 alias3", ki18n("Visible name replacement for input file 3.") );
-// options.add( "L" ).add( "fname alias", ki18n("Alternative visible name replacement. Supply this once for every input.") );
-// options.add( "cs string", ki18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"") );
-// options.add( "confighelp", ki18n("Show list of config settings and current values.") );
// options.add( "config file", ki18n("Use a different config file.") );
+ aboutData.setupCommandLine(&parser);
+ parser.process(app);
+ aboutData.processCommandLine(&parser);
KDiff3Shell *p = new KDiff3Shell(&parser);
p->show();
|
