Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 472306 Details for
Bug 546494
kde-misc/kdiff3-0.9.98 has regressions
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Implements missing command line options
commit-e37fe0d (text/plain), 3.56 KB, created by
peteru
on 2017-05-11 06:37:01 UTC
(
hide
)
Description:
Implements missing command line options
Filename:
MIME Type:
Creator:
peteru
Created:
2017-05-11 06:37:01 UTC
Size:
3.56 KB
patch
obsolete
>From e37fe0d33890c8746f803e1e4ef921d5b263167e Mon Sep 17 00:00:00 2001 >From: Peter Urbanec <git.user@urbanec.net> >Date: Thu, 11 May 2017 16:09:12 +1000 >Subject: 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/kdiff3/src/main.cpp b/kdiff3/src/main.cpp >index 3549c92..fed486d 100644 >--- a/kdiff3/src/main.cpp >+++ b/kdiff3/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();
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 546494
: 472306