From 29eadf71414d583fc2162857cf08eab6bd23f1f4 Mon Sep 17 00:00:00 2001
From: Michal Siedlaczek <michal.siedlaczek@nyu.edu>
Date: Sun, 11 Mar 2018 17:47:18 -0400
Subject: [PATCH 01/73] Filter installed dictionaries using a regex to ensure
 correct name

---
 qutebrowser/browser/webengine/spell.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/browser/webengine/spell.py b/qutebrowser/browser/webengine/spell.py
index beebe4da7..b887a2295 100644
--- a/qutebrowser/browser/webengine/spell.py
+++ b/qutebrowser/browser/webengine/spell.py
@@ -24,16 +24,14 @@ import os
 import re
 
 from PyQt5.QtCore import QLibraryInfo
-from qutebrowser.utils import log
+from qutebrowser.utils import log, message
+
+dict_version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
 
 
 def version(filename):
     """Extract the version number from the dictionary file name."""
-    version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
-    match = version_re.fullmatch(filename)
-    if match is None:
-        raise ValueError('the given dictionary file name is malformed: {}'
-                         .format(filename))
+    match = dict_version_re.match(filename)
     return tuple(int(n) for n in match.group('version').split('-'))
 
 
@@ -46,7 +44,7 @@ def dictionary_dir():
 def local_files(code):
     """Return all installed dictionaries for the given code."""
     pathname = os.path.join(dictionary_dir(), '{}*.bdic'.format(code))
-    matching_dicts = glob.glob(pathname)
+    matching_dicts = filter(dict_version_re.match, glob.glob(pathname))
     files = []
     for matching_dict in sorted(matching_dicts, key=version, reverse=True):
         filename = os.path.basename(matching_dict)

From f9e702bae5da5f91f3f7a5d8564f42f5b4e7cbdb Mon Sep 17 00:00:00 2001
From: Michal Siedlaczek <michal.siedlaczek@nyu.edu>
Date: Fri, 16 Mar 2018 11:28:45 -0400
Subject: [PATCH 02/73] Warn about malformed dictionaries

---
 qutebrowser/browser/webengine/spell.py     | 28 +++++++++++++++-------
 tests/unit/browser/webengine/test_spell.py | 13 ++++++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/browser/webengine/spell.py b/qutebrowser/browser/webengine/spell.py
index b887a2295..5c2ed551b 100644
--- a/qutebrowser/browser/webengine/spell.py
+++ b/qutebrowser/browser/webengine/spell.py
@@ -32,6 +32,10 @@ dict_version_re = re.compile(r".+-(?P<version>[0-9]+-[0-9]+?)\.bdic")
 def version(filename):
     """Extract the version number from the dictionary file name."""
     match = dict_version_re.match(filename)
+    if match is None:
+        message.warning(
+            "Found a dictionary with a malformed name: {}".format(filename))
+        return None
     return tuple(int(n) for n in match.group('version').split('-'))
 
 
@@ -42,15 +46,23 @@ def dictionary_dir():
 
 
 def local_files(code):
-    """Return all installed dictionaries for the given code."""
+    """Return all installed dictionaries for the given code.
+
+    The returned dictionaries are sorted by version, therefore the latest will
+    be the first element. The list will be empty if no dictionaries are found.
+    """
     pathname = os.path.join(dictionary_dir(), '{}*.bdic'.format(code))
-    matching_dicts = filter(dict_version_re.match, glob.glob(pathname))
-    files = []
-    for matching_dict in sorted(matching_dicts, key=version, reverse=True):
-        filename = os.path.basename(matching_dict)
-        log.config.debug('Found file for dict {}: {}'.format(code, filename))
-        files.append(filename)
-    return files
+    matching_dicts = glob.glob(pathname)
+    versioned_dicts = []
+    for matching_dict in matching_dicts:
+        parsed_version = version(matching_dict)
+        if parsed_version is not None:
+            filename = os.path.basename(matching_dict)
+            log.config.debug('Found file for dict {}: {}'
+                             .format(code, filename))
+            versioned_dicts.append((parsed_version, filename))
+    return [filename for version, filename
+            in sorted(versioned_dicts, reverse=True)]
 
 
 def local_filename(code):
diff --git a/tests/unit/browser/webengine/test_spell.py b/tests/unit/browser/webengine/test_spell.py
index efe62fb20..ec2831cc6 100644
--- a/tests/unit/browser/webengine/test_spell.py
+++ b/tests/unit/browser/webengine/test_spell.py
@@ -17,15 +17,20 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-import pytest
+import logging
+
 from qutebrowser.browser.webengine import spell
+from qutebrowser.utils import usertypes
 
 
-def test_version():
+def test_version(message_mock, caplog):
     assert spell.version('en-US-8-0.bdic') == (8, 0)
     assert spell.version('pl-PL-3-0.bdic') == (3, 0)
-    with pytest.raises(ValueError):
-        spell.version('malformed_filename')
+    with caplog.at_level(logging.WARNING):
+        assert spell.version('malformed_filename') is None
+    msg = message_mock.getmsg(usertypes.MessageLevel.warning)
+    expected = ("Found a dictionary with a malformed name: malformed_filename")
+    assert msg.text == expected
 
 
 def test_local_filename_dictionary_does_not_exist(tmpdir, monkeypatch):

From b169a1c802e2c90182df76820c00190e4669271e Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 22 Mar 2018 02:38:38 -0400
Subject: [PATCH 03/73] Add raw first draft of qute-keepass

This needs a lot more work...
---
 misc/userscripts/qute-keepass | 209 ++++++++++++++++++++++++++++++++++
 1 file changed, 209 insertions(+)
 create mode 100755 misc/userscripts/qute-keepass

diff --git a/misc/userscripts/qute-keepass b/misc/userscripts/qute-keepass
new file mode 100755
index 000000000..4d25e7037
--- /dev/null
+++ b/misc/userscripts/qute-keepass
@@ -0,0 +1,209 @@
+#!/usr/bin/env python3
+
+# Copyright 2018 Jay Kamat <jaygkamat@gmail.com>
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser 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 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser 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 qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+USAGE = """This userscript allows for insertion of usernames and passwords from keepass
+databases using pykeepass. Since it is a userscript, it must be run from qutebrowser.
+
+A sample invocation of this script is:
+
+:spawn --userscript qute-keepass -p ~/KeePassFiles/MainDatabase.kdbx
+
+And a sample binding
+
+:bind --mode=insert <ctrl-i> spawn --userscript qute-keepass -p ~/KeePassFiles/MainDatabase.kdbx
+
+login information is inserted by emulating key events using qutebrowser's
+fake-key command in this manner: [USERNAME]<Tab>[PASSWORD], which is compatible
+with almost all login forms.
+
+Dependencies: pykeepass (in python3), PyQt5
+
+WARNING: The login details are viewable as plaintext in qutebrowser's debug log
+(qute://log) and might be shared if you decide to submit a crash report!"""
+
+import argparse
+import enum
+import functools
+import os
+import shlex
+import subprocess
+import sys
+
+
+from PyQt5.QtCore import QUrl
+from PyQt5.QtWidgets import QApplication, QInputDialog, QLineEdit
+
+try:
+    import pykeepass
+except ImportError:
+    print("pykeepass not found!", file=sys.stderr)
+    sys.exit(100)
+
+argument_parser = argparse.ArgumentParser(
+    description=__doc__,
+    formatter_class=argparse.RawDescriptionHelpFormatter,
+    epilog=USAGE)
+argument_parser.add_argument('url', nargs='?', default=os.getenv('QUTE_URL'))
+argument_parser.add_argument('--path', '-p', required=True,
+                             help='Path to the keepass db')
+argument_parser.add_argument(
+    '--dmenu-invocation', '-d', default='dmenu',
+    help='Invocation used to execute a dmenu-provider')
+argument_parser.add_argument(
+    '--dmenu-format', '-f', default='{title}: {username}',
+    help='Format string for keys to display in dmenu. Must be unique.')
+argument_parser.add_argument(
+    '--no-insert-mode', '-n', dest='insert_mode', action='store_false',
+    help="Don't automatically enter insert mode")
+argument_parser.add_argument(
+    '--io-encoding', '-i', default='UTF-8',
+    help='Encoding used to communicate with subprocesses')
+group = argument_parser.add_mutually_exclusive_group()
+group.add_argument('--username-only', '-e',
+                   action='store_true', help='Only insert username')
+group.add_argument('--password-only', '-w',
+                   action='store_true', help='Only insert password')
+
+
+class ExitCodes(enum.IntEnum):
+    """Stores various exit codes groups to use."""
+    SUCCESS = 0
+    FAILURE = 1
+    # 1 is automatically used if Python throws an exception
+    NO_CANDIDATES = 2
+    USER_QUIT = 3
+    DB_OPEN_FAIL = 3
+
+    INTERNAL_ERROR = 10
+
+
+def qute_command(command):
+    with open(os.environ['QUTE_FIFO'], 'w') as fifo:
+        fifo.write(command + '\n')
+        fifo.flush()
+
+
+def stderr(to_print):
+    print(to_print, file=sys.stderr)
+    qute_command('message-error "{}"'.format(to_print))
+
+
+def dmenu(items, invocation, encoding):
+    """Runs dmenu with given arguments."""
+    command = shlex.split(invocation)
+    process = subprocess.run(command, input='\n'.join(items).encode(encoding),
+                             stdout=subprocess.PIPE)
+    return process.stdout.decode(encoding).strip()
+
+
+def get_password():
+    """Get a keepass db password from user."""
+    _app = QApplication(sys.argv)
+    text, ok = QInputDialog.getText(
+        None, "KeePass DB Password",
+        "Please enter your KeePass Master Password",
+        QLineEdit.Password)
+    if not ok:
+        stderr('Password Prompt Rejected.')
+        return ExitCodes.USER_QUIT
+    return text
+
+
+def find_candidates(args, host):
+    """Finds candidates that match host"""
+    file_path = os.path.expanduser(args.path)
+
+    # TODO find a way to keep the db open, so we don't open it every time.
+    try:
+        kp = pykeepass.PyKeePass(file_path, password=get_password())
+    except Exception as e:
+        stderr("There was an error opening the DB: {}".format(str(e)))
+
+    return kp.find_entries(url="{}{}{}".format(".*", host, ".*"), regex=True)
+
+
+def candidate_to_str(args, candidate):
+    """Turns candidate into a human readable string for dmenu"""
+    return args.dmenu_format.format(title=candidate.title,
+                                    url=candidate.url,
+                                    username=candidate.username,
+                                    path=candidate.path,
+                                    uuid=candidate.uuid)
+
+
+def candidate_to_secret(candidate):
+    """Turns candidate into a generic (user, password) tuple"""
+    return (candidate.username, candidate.password)
+
+
+def run(args):
+    """Runs qute-keepass"""
+    if not args.url:
+        argument_parser.print_help()
+        return ExitCodes.FAILURE
+
+    url_host = QUrl(args.url).host()
+
+    if not url_host:
+        stderr('{} was not parsed as a valid URL!'.format(args.url))
+        return ExitCodes.INTERNAL_ERROR
+
+    # Find candidates matching the host of the given URL
+    candidates = find_candidates(args, url_host)
+    if not candidates:
+        stderr('No candidates for URL {!r} found!'.format(args.url))
+        return ExitCodes.NO_CANDIDATES
+
+    # Create a map so we can get turn the resulting string from dmenu back into
+    # a candidate
+    candidates_map = dict(zip(map(
+        functools.partial(candidate_to_str, args), candidates), candidates))
+
+    if len(candidates) == 1:
+        selection = candidates.pop()
+    else:
+        selection = dmenu(candidates_map.keys(),
+                          args.dmenu_invocation,
+                          args.io_encoding)
+
+    if selection not in candidates_map:
+        stderr("'{}' was not a valid entry!").format(selection)
+        return ExitCodes.USER_QUIT
+
+    selection = candidates_map[selection]
+    username, password = candidate_to_secret(selection)
+
+    insert_mode = ';; enter-mode insert' if args.insert_mode else ''
+    if args.username_only:
+        qute_command('fake-key {}{}'.format(username, insert_mode))
+    elif args.password_only:
+        qute_command('fake-key {}{}'.format(password, insert_mode))
+    else:
+        # Enter username and password using fake-key and <Tab> (which seems to
+        # work almost universally), then switch back into insert-mode, so the
+        # form can be directly submitted by hitting enter afterwards
+        qute_command('fake-key {} ;; fake-key <Tab> ;; fake-key {}{}'
+                     .format(username, password, insert_mode))
+
+    return ExitCodes.SUCCESS
+
+
+if __name__ == '__main__':
+    arguments = argument_parser.parse_args()
+    sys.exit(run(arguments))

From a9a7f5da45a1f731f651e2948c4852e0dc27b6f1 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 22 Mar 2018 03:01:50 -0400
Subject: [PATCH 04/73] Fix choking on passwords with <x> syntax in them

---
 misc/userscripts/qute-keepass | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/misc/userscripts/qute-keepass b/misc/userscripts/qute-keepass
index 4d25e7037..70b9a53d7 100755
--- a/misc/userscripts/qute-keepass
+++ b/misc/userscripts/qute-keepass
@@ -80,6 +80,7 @@ group.add_argument('--username-only', '-e',
 group.add_argument('--password-only', '-w',
                    action='store_true', help='Only insert password')
 
+CMD_DELAY = 50
 
 class ExitCodes(enum.IntEnum):
     """Stores various exit codes groups to use."""
@@ -191,15 +192,18 @@ def run(args):
 
     insert_mode = ';; enter-mode insert' if args.insert_mode else ''
     if args.username_only:
-        qute_command('fake-key {}{}'.format(username, insert_mode))
+        qute_command('insert-text {}{}'.format(username, insert_mode))
     elif args.password_only:
-        qute_command('fake-key {}{}'.format(password, insert_mode))
+        qute_command('insert-text {}{}'.format(password, insert_mode))
     else:
         # Enter username and password using fake-key and <Tab> (which seems to
         # work almost universally), then switch back into insert-mode, so the
         # form can be directly submitted by hitting enter afterwards
-        qute_command('fake-key {} ;; fake-key <Tab> ;; fake-key {}{}'
-                     .format(username, password, insert_mode))
+        qute_command('insert-text {} ;;'
+                     'later {} fake-key <Tab> ;;'
+                     'later {} insert-text {}{}'
+                     .format(username, CMD_DELAY,
+                             CMD_DELAY * 2, password, insert_mode))
 
     return ExitCodes.SUCCESS
 

From 948866f4f29f48c707d527ea71b23624aa9deb25 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 22 Mar 2018 21:05:35 -0400
Subject: [PATCH 05/73] Add support for keepass keyfiles

---
 misc/userscripts/qute-keepass | 79 ++++++++++++++++++++++++++---------
 1 file changed, 59 insertions(+), 20 deletions(-)

diff --git a/misc/userscripts/qute-keepass b/misc/userscripts/qute-keepass
index 70b9a53d7..3258a3e0f 100755
--- a/misc/userscripts/qute-keepass
+++ b/misc/userscripts/qute-keepass
@@ -17,8 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-USAGE = """This userscript allows for insertion of usernames and passwords from keepass
-databases using pykeepass. Since it is a userscript, it must be run from qutebrowser.
+# pylint: disable=bad-builtin
+
+USAGE = """This userscript allows for insertion of usernames and passwords from
+keepass databases using pykeepass. Since it is a userscript, it must be run from
+qutebrowser.
 
 A sample invocation of this script is:
 
@@ -28,14 +31,29 @@ And a sample binding
 
 :bind --mode=insert <ctrl-i> spawn --userscript qute-keepass -p ~/KeePassFiles/MainDatabase.kdbx
 
-login information is inserted by emulating key events using qutebrowser's
-fake-key command in this manner: [USERNAME]<Tab>[PASSWORD], which is compatible
-with almost all login forms.
+-p or --path is a required argument.
 
-Dependencies: pykeepass (in python3), PyQt5
+--keyfile-path allows you to specify a keepass keyfile. If you only use a
+  keyfile, also add --no-password as well. Specifying --no-password without
+  --keyfile-path will lead to an error.
+
+login information is inserted using :insert-text and :fake-key <Tab>, which
+means you must have a cursor in position before initiating this userscript. If
+you do not do this, you will get 'element not editable' errors.
+
+If keepass takes a while to open the DB, you might want to consider reducing
+the number of transform rounds in your database settings.
+
+Dependencies: pykeepass (in python3), PyQt5. Without pykeepass, you will get an
+exit code of 100.
+
+********************!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!******************
 
 WARNING: The login details are viewable as plaintext in qutebrowser's debug log
-(qute://log) and might be shared if you decide to submit a crash report!"""
+(qute://log) and could be compromised if you decide to submit a crash report!
+
+********************!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!******************
+"""
 
 import argparse
 import enum
@@ -45,7 +63,6 @@ import shlex
 import subprocess
 import sys
 
-
 from PyQt5.QtCore import QUrl
 from PyQt5.QtWidgets import QApplication, QInputDialog, QLineEdit
 
@@ -61,13 +78,19 @@ argument_parser = argparse.ArgumentParser(
     epilog=USAGE)
 argument_parser.add_argument('url', nargs='?', default=os.getenv('QUTE_URL'))
 argument_parser.add_argument('--path', '-p', required=True,
-                             help='Path to the keepass db')
+                             help='Path to the keepass db.')
+argument_parser.add_argument('--keyfile-path', '-k', default=None,
+                             help='Path to a keepass keyfile')
+argument_parser.add_argument('--no-password', action='store_true',
+                             help='True if no password is required.'
+                             'Only allowed with --keyfile-path')
 argument_parser.add_argument(
     '--dmenu-invocation', '-d', default='dmenu',
     help='Invocation used to execute a dmenu-provider')
 argument_parser.add_argument(
     '--dmenu-format', '-f', default='{title}: {username}',
-    help='Format string for keys to display in dmenu. Must be unique.')
+    help='Format string for keys to display in dmenu.'
+    ' Must generate a unique string.')
 argument_parser.add_argument(
     '--no-insert-mode', '-n', dest='insert_mode', action='store_false',
     help="Don't automatically enter insert mode")
@@ -82,6 +105,7 @@ group.add_argument('--password-only', '-w',
 
 CMD_DELAY = 50
 
+
 class ExitCodes(enum.IntEnum):
     """Stores various exit codes groups to use."""
     SUCCESS = 0
@@ -89,7 +113,7 @@ class ExitCodes(enum.IntEnum):
     # 1 is automatically used if Python throws an exception
     NO_CANDIDATES = 2
     USER_QUIT = 3
-    DB_OPEN_FAIL = 3
+    DB_OPEN_FAIL = 4
 
     INTERNAL_ERROR = 10
 
@@ -101,6 +125,7 @@ def qute_command(command):
 
 
 def stderr(to_print):
+    """Extra functionality to echo out errors to qb ui."""
     print(to_print, file=sys.stderr)
     qute_command('message-error "{}"'.format(to_print))
 
@@ -122,7 +147,7 @@ def get_password():
         QLineEdit.Password)
     if not ok:
         stderr('Password Prompt Rejected.')
-        return ExitCodes.USER_QUIT
+        sys.exit(ExitCodes.USER_QUIT)
     return text
 
 
@@ -130,9 +155,19 @@ def find_candidates(args, host):
     """Finds candidates that match host"""
     file_path = os.path.expanduser(args.path)
 
-    # TODO find a way to keep the db open, so we don't open it every time.
+    # TODO find a way to keep the db open, so we don't open (and query
+    # password) it every time
+
+    pw = None
+    if not args.no_password:
+        pw = get_password()
+
+    kf = args.keyfile_path
+    if kf:
+        kf = os.path.expanduser(kf)
+
     try:
-        kp = pykeepass.PyKeePass(file_path, password=get_password())
+        kp = pykeepass.PyKeePass(file_path, password=pw, keyfile=kf)
     except Exception as e:
         stderr("There was an error opening the DB: {}".format(str(e)))
 
@@ -173,13 +208,14 @@ def run(args):
 
     # Create a map so we can get turn the resulting string from dmenu back into
     # a candidate
-    candidates_map = dict(zip(map(
-        functools.partial(candidate_to_str, args), candidates), candidates))
+    candidates_strs = list(map(functools.partial(candidate_to_str, args),
+                               candidates))
+    candidates_map = dict(zip(candidates_strs, candidates))
 
     if len(candidates) == 1:
         selection = candidates.pop()
     else:
-        selection = dmenu(candidates_map.keys(),
+        selection = dmenu(candidates_strs,
                           args.dmenu_invocation,
                           args.io_encoding)
 
@@ -196,9 +232,12 @@ def run(args):
     elif args.password_only:
         qute_command('insert-text {}{}'.format(password, insert_mode))
     else:
-        # Enter username and password using fake-key and <Tab> (which seems to
-        # work almost universally), then switch back into insert-mode, so the
-        # form can be directly submitted by hitting enter afterwards
+        # Enter username and password using insert-key and fake-key <Tab>
+        # (which supports more passwords than fake-key only), then switch back
+        # into insert-mode, so the form can be directly submitted by hitting
+        # enter afterwards. It dosen't matter when we go into insert mode, but
+        # the other commands need to be be executed sequentially, so we add
+        # delays with later.
         qute_command('insert-text {} ;;'
                      'later {} fake-key <Tab> ;;'
                      'later {} insert-text {}{}'

From a1776087e0233009721cf82a9a12c6deb9b0cebe Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 22 Mar 2018 21:35:00 -0400
Subject: [PATCH 06/73] Fix login when only one entry is available

---
 misc/userscripts/qute-keepass | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/misc/userscripts/qute-keepass b/misc/userscripts/qute-keepass
index 3258a3e0f..55d39e6e4 100755
--- a/misc/userscripts/qute-keepass
+++ b/misc/userscripts/qute-keepass
@@ -219,11 +219,12 @@ def run(args):
                           args.dmenu_invocation,
                           args.io_encoding)
 
-    if selection not in candidates_map:
-        stderr("'{}' was not a valid entry!").format(selection)
-        return ExitCodes.USER_QUIT
+        if selection not in candidates_map:
+            stderr("'{}' was not a valid entry!").format(selection)
+            return ExitCodes.USER_QUIT
+
+        selection = candidates_map[selection]
 
-    selection = candidates_map[selection]
     username, password = candidate_to_secret(selection)
 
     insert_mode = ';; enter-mode insert' if args.insert_mode else ''

From f237a87ad0e568d305426ab6b3baf6b83702b4fc Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sun, 25 Mar 2018 21:59:30 -0400
Subject: [PATCH 07/73] Completion for varargs.

When a command has positional varargs, keep offering the configured
completion for each successive argument.

Right now this only influences `config-cycle`.

Previously, `config-cycle <option> ` would offer a value completion for
only the first argument after the option. Now it will keep offering
value completion for each successive argument.

This will be useful for passing multiple tags to the new bookmark
commands that will be added for #882.
---
 qutebrowser/commands/command.py         |  5 +++++
 tests/unit/completion/test_completer.py | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/qutebrowser/commands/command.py b/qutebrowser/commands/command.py
index 8dd830495..5c5ab1311 100644
--- a/qutebrowser/commands/command.py
+++ b/qutebrowser/commands/command.py
@@ -123,6 +123,7 @@ class Command:
         self.pos_args = []
         self.desc = None
         self.flags_with_args = []
+        self._has_vararg = False
 
         # This is checked by future @cmdutils.argument calls so they fail
         # (as they'd be silently ignored otherwise)
@@ -170,6 +171,8 @@ class Command:
 
     def get_pos_arg_info(self, pos):
         """Get an ArgInfo tuple for the given positional parameter."""
+        if pos >= len(self.pos_args) and self._has_vararg:
+            pos = len(self.pos_args) - 1
         name = self.pos_args[pos][0]
         return self._qute_args.get(name, ArgInfo())
 
@@ -233,6 +236,8 @@ class Command:
             log.commands.vdebug('Adding arg {} of type {} -> {}'.format(
                 param.name, typ, callsig))
             self.parser.add_argument(*args, **kwargs)
+            if param.kind == inspect.Parameter.VAR_POSITIONAL:
+                self._has_vararg = True
         return signature.parameters.values()
 
     def _param_to_argparse_kwargs(self, param, is_bool):
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index 51aa091b9..74313911f 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -129,12 +129,20 @@ def cmdutils_patch(monkeypatch, stubs, miscmodels_patch):
         """docstring."""
         pass
 
+    @cmdutils.argument('option', completion=miscmodels_patch.option)
+    @cmdutils.argument('values', completion=miscmodels_patch.value)
+    def config_cycle(option, *values):
+        """For testing varargs."""
+        pass
+
     cmd_utils = stubs.FakeCmdUtils({
         'set': command.Command(name='set', handler=set_command),
         'help': command.Command(name='help', handler=show_help),
         'open': command.Command(name='open', handler=openurl, maxsplit=0),
         'bind': command.Command(name='bind', handler=bind),
         'tab-detach': command.Command(name='tab-detach', handler=tab_detach),
+        'config-cycle': command.Command(name='config-cycle',
+                                        handler=config_cycle),
     })
     monkeypatch.setattr(completer, 'cmdutils', cmd_utils)
 
@@ -191,6 +199,10 @@ def _set_cmd_prompt(cmd, txt):
     ('/:help|', None, '', []),
     ('::bind|', 'command', ':bind', []),
     (':-w open |', None, '', []),
+    # varargs
+    (':config-cycle option |', 'value', '', ['option']),
+    (':config-cycle option one |', 'value', '', ['option', 'one']),
+    (':config-cycle option one two |', 'value', '', ['option', 'one', 'two']),
 ])
 def test_update_completion(txt, kind, pattern, pos_args, status_command_stub,
                            completer_obj, completion_widget_stub, config_stub,

From b873cfb18ab8a9ddd1b2e17c5f9043f4b6b9921b Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Tue, 27 Mar 2018 23:43:08 -0400
Subject: [PATCH 08/73] Fix style issues in qute-keepass

---
 misc/userscripts/qute-keepass | 42 +++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/misc/userscripts/qute-keepass b/misc/userscripts/qute-keepass
index 55d39e6e4..a21ebc9b3 100755
--- a/misc/userscripts/qute-keepass
+++ b/misc/userscripts/qute-keepass
@@ -17,10 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
-# pylint: disable=bad-builtin
-
-USAGE = """This userscript allows for insertion of usernames and passwords from
-keepass databases using pykeepass. Since it is a userscript, it must be run from
+"""This userscript allows for insertion of usernames and passwords from keepass
+databases using pykeepass. Since it is a userscript, it must be run from
 qutebrowser.
 
 A sample invocation of this script is:
@@ -34,8 +32,8 @@ And a sample binding
 -p or --path is a required argument.
 
 --keyfile-path allows you to specify a keepass keyfile. If you only use a
-  keyfile, also add --no-password as well. Specifying --no-password without
-  --keyfile-path will lead to an error.
+keyfile, also add --no-password as well. Specifying --no-password without
+--keyfile-path will lead to an error.
 
 login information is inserted using :insert-text and :fake-key <Tab>, which
 means you must have a cursor in position before initiating this userscript. If
@@ -53,8 +51,11 @@ WARNING: The login details are viewable as plaintext in qutebrowser's debug log
 (qute://log) and could be compromised if you decide to submit a crash report!
 
 ********************!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!******************
+
 """
 
+# pylint: disable=bad-builtin
+
 import argparse
 import enum
 import functools
@@ -68,22 +69,29 @@ from PyQt5.QtWidgets import QApplication, QInputDialog, QLineEdit
 
 try:
     import pykeepass
-except ImportError:
-    print("pykeepass not found!", file=sys.stderr)
+except ImportError as e:
+    print("pykeepass not found: {}".format(str(e)), file=sys.stderr)
+
+    # Since this is a common error, try to print it to the FIFO if we can.
+    if 'QUTE_FIFO' in os.environ:
+        with open(os.environ['QUTE_FIFO'], 'w') as fifo:
+            fifo.write('message-error "pykeepass failed to be imported."\n')
+            fifo.flush()
     sys.exit(100)
 
 argument_parser = argparse.ArgumentParser(
-    description=__doc__,
+    description="Fill passwords using keepass.",
     formatter_class=argparse.RawDescriptionHelpFormatter,
-    epilog=USAGE)
+    epilog=__doc__)
 argument_parser.add_argument('url', nargs='?', default=os.getenv('QUTE_URL'))
 argument_parser.add_argument('--path', '-p', required=True,
                              help='Path to the keepass db.')
 argument_parser.add_argument('--keyfile-path', '-k', default=None,
                              help='Path to a keepass keyfile')
-argument_parser.add_argument('--no-password', action='store_true',
-                             help='True if no password is required.'
-                             'Only allowed with --keyfile-path')
+argument_parser.add_argument(
+    '--no-password', action='store_true',
+    help='Supply if no password is required to unlock this database. '
+    'Only allowed with --keyfile-path')
 argument_parser.add_argument(
     '--dmenu-invocation', '-d', default='dmenu',
     help='Invocation used to execute a dmenu-provider')
@@ -98,9 +106,9 @@ argument_parser.add_argument(
     '--io-encoding', '-i', default='UTF-8',
     help='Encoding used to communicate with subprocesses')
 group = argument_parser.add_mutually_exclusive_group()
-group.add_argument('--username-only', '-e',
+group.add_argument('--username-fill-only', '-e',
                    action='store_true', help='Only insert username')
-group.add_argument('--password-only', '-w',
+group.add_argument('--password-fill-only', '-w',
                    action='store_true', help='Only insert password')
 
 CMD_DELAY = 50
@@ -228,9 +236,9 @@ def run(args):
     username, password = candidate_to_secret(selection)
 
     insert_mode = ';; enter-mode insert' if args.insert_mode else ''
-    if args.username_only:
+    if args.username_fill_only:
         qute_command('insert-text {}{}'.format(username, insert_mode))
-    elif args.password_only:
+    elif args.password_fill_only:
         qute_command('insert-text {}{}'.format(password, insert_mode))
     else:
         # Enter username and password using insert-key and fake-key <Tab>

From 7c1de998760dc66ef3d65f81451e9d9af09e13e7 Mon Sep 17 00:00:00 2001
From: Michal Siedlaczek <michal.siedlaczek@nyu.edu>
Date: Wed, 28 Mar 2018 12:16:50 -0400
Subject: [PATCH 09/73] Fix test coverage

---
 tests/unit/browser/webengine/test_spell.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/unit/browser/webengine/test_spell.py b/tests/unit/browser/webengine/test_spell.py
index ec2831cc6..92a348905 100644
--- a/tests/unit/browser/webengine/test_spell.py
+++ b/tests/unit/browser/webengine/test_spell.py
@@ -19,6 +19,7 @@
 
 import logging
 
+from PyQt5.QtCore import QLibraryInfo
 from qutebrowser.browser.webengine import spell
 from qutebrowser.utils import usertypes
 
@@ -33,6 +34,11 @@ def test_version(message_mock, caplog):
     assert msg.text == expected
 
 
+def test_dictionary_dir(monkeypatch):
+    monkeypatch.setattr(QLibraryInfo, 'location', lambda _: 'datapath')
+    assert spell.dictionary_dir() == 'datapath/qtwebengine_dictionaries'
+
+
 def test_local_filename_dictionary_does_not_exist(tmpdir, monkeypatch):
     monkeypatch.setattr(
         spell, 'dictionary_dir', lambda: '/some-non-existing-dir')
@@ -44,9 +50,24 @@ def test_local_filename_dictionary_not_installed(tmpdir, monkeypatch):
     assert not spell.local_filename('en-US')
 
 
+def test_local_filename_dictionary_not_installed_with_malformed(tmpdir, monkeypatch, caplog):
+    monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
+    (tmpdir / 'en-US.bdic').ensure()
+    with caplog.at_level(logging.WARNING):
+        assert not spell.local_filename('en-US')
+
+
 def test_local_filename_dictionary_installed(tmpdir, monkeypatch):
     monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
     for lang_file in ['en-US-11-0.bdic', 'en-US-7-1.bdic', 'pl-PL-3-0.bdic']:
         (tmpdir / lang_file).ensure()
     assert spell.local_filename('en-US') == 'en-US-11-0'
     assert spell.local_filename('pl-PL') == 'pl-PL-3-0'
+
+
+def test_local_filename_dictionary_installed_with_malformed(tmpdir, monkeypatch, caplog):
+    monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
+    for lang_file in ['en-US-11-0.bdic', 'en-US-7-1.bdic', 'en-US.bdic']:
+        (tmpdir / lang_file).ensure()
+    with caplog.at_level(logging.WARNING):
+        assert spell.local_filename('en-US') == 'en-US-11-0'

From d606cd55506285c1d2ed864c213f01d4e5c5a621 Mon Sep 17 00:00:00 2001
From: Michal Siedlaczek <michal.siedlaczek@nyu.edu>
Date: Wed, 28 Mar 2018 14:13:46 -0400
Subject: [PATCH 10/73] spell test formatting and docstrings

---
 tests/unit/browser/webengine/test_spell.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/unit/browser/webengine/test_spell.py b/tests/unit/browser/webengine/test_spell.py
index 92a348905..faccd7745 100644
--- a/tests/unit/browser/webengine/test_spell.py
+++ b/tests/unit/browser/webengine/test_spell.py
@@ -17,7 +17,10 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
 
+"""Tests for qutebrowser.browser.webengine.spell module."""
+
 import logging
+import os
 
 from PyQt5.QtCore import QLibraryInfo
 from qutebrowser.browser.webengine import spell
@@ -25,6 +28,7 @@ from qutebrowser.utils import usertypes
 
 
 def test_version(message_mock, caplog):
+    """Tests parsing dictionary version from its file name."""
     assert spell.version('en-US-8-0.bdic') == (8, 0)
     assert spell.version('pl-PL-3-0.bdic') == (3, 0)
     with caplog.at_level(logging.WARNING):
@@ -36,21 +40,25 @@ def test_version(message_mock, caplog):
 
 def test_dictionary_dir(monkeypatch):
     monkeypatch.setattr(QLibraryInfo, 'location', lambda _: 'datapath')
-    assert spell.dictionary_dir() == 'datapath/qtwebengine_dictionaries'
+    assert spell.dictionary_dir() == os.path.join('datapath',
+                                                  'qtwebengine_dictionaries')
 
 
-def test_local_filename_dictionary_does_not_exist(tmpdir, monkeypatch):
+def test_local_filename_dictionary_does_not_exist(monkeypatch):
+    """Tests retrieving local filename when the dir doesn't exits."""
     monkeypatch.setattr(
         spell, 'dictionary_dir', lambda: '/some-non-existing-dir')
     assert not spell.local_filename('en-US')
 
 
 def test_local_filename_dictionary_not_installed(tmpdir, monkeypatch):
+    """Tests retrieving local filename when the dict not installed."""
     monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
     assert not spell.local_filename('en-US')
 
 
-def test_local_filename_dictionary_not_installed_with_malformed(tmpdir, monkeypatch, caplog):
+def test_local_filename_not_installed_malformed(tmpdir, monkeypatch, caplog):
+    """Tests retrieving local filename when the only file is malformed."""
     monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
     (tmpdir / 'en-US.bdic').ensure()
     with caplog.at_level(logging.WARNING):
@@ -58,6 +66,7 @@ def test_local_filename_dictionary_not_installed_with_malformed(tmpdir, monkeypa
 
 
 def test_local_filename_dictionary_installed(tmpdir, monkeypatch):
+    """Tests retrieving local filename when the dict installed."""
     monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
     for lang_file in ['en-US-11-0.bdic', 'en-US-7-1.bdic', 'pl-PL-3-0.bdic']:
         (tmpdir / lang_file).ensure()
@@ -65,7 +74,9 @@ def test_local_filename_dictionary_installed(tmpdir, monkeypatch):
     assert spell.local_filename('pl-PL') == 'pl-PL-3-0'
 
 
-def test_local_filename_dictionary_installed_with_malformed(tmpdir, monkeypatch, caplog):
+def test_local_filename_installed_malformed(tmpdir, monkeypatch, caplog):
+    """Tests retrieving local filename when the dict installed and another
+    file is malformed."""
     monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
     for lang_file in ['en-US-11-0.bdic', 'en-US-7-1.bdic', 'en-US.bdic']:
         (tmpdir / lang_file).ensure()

From 3d5d679561e0ce4c97e54fad0b561ca16273bfaf Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 30 Mar 2018 14:25:51 -0400
Subject: [PATCH 11/73] Add basic implementation for clicking first hinted
 element

---
 qutebrowser/browser/hints.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index f7bcd713c..13078efe2 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -172,6 +172,7 @@ class HintContext:
     tab = attr.ib(None)
     group = attr.ib(None)
     hint_mode = attr.ib(None)
+    first = attr.ib(False)
 
     def get_args(self, urlstr):
         """Get the arguments, with {hint-url} replaced by the given URL."""
@@ -612,6 +613,9 @@ class HintManager(QObject):
         modeman.enter(self._win_id, usertypes.KeyMode.hint,
                       'HintManager.start')
 
+        if self._context.first:
+            self._fire(strings[0])
+            return
         # to make auto_follow == 'always' work
         self._handle_auto_follow()
 
@@ -620,7 +624,8 @@ class HintManager(QObject):
     @cmdutils.argument('win_id', win_id=True)
     def start(self,  # pylint: disable=keyword-arg-before-vararg
               group=webelem.Group.all, target=Target.normal,
-              *args, win_id, mode=None, add_history=False, rapid=False):
+              *args, win_id, mode=None, add_history=False, rapid=False,
+              first=False):
         """Start hinting.
 
         Args:
@@ -632,6 +637,7 @@ class HintManager(QObject):
             add_history: Whether to add the spawned or yanked link to the
                          browsing history.
             group: The element types to hint.
+            first: Click the first hinted element without prompting.
 
                 - `all`: All clickable elements.
                 - `links`: Only links.
@@ -713,6 +719,7 @@ class HintManager(QObject):
         self._context.rapid = rapid
         self._context.hint_mode = mode
         self._context.add_history = add_history
+        self._context.first = first
         try:
             self._context.baseurl = tabbed_browser.current_url()
         except qtutils.QtValueError:

From cb8a75577e32dd4a372d7e1aa1fcf8efa2633079 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Fri, 30 Mar 2018 14:44:03 -0400
Subject: [PATCH 12/73] Add tests for hinting with --first

---
 tests/end2end/features/hints.feature | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/end2end/features/hints.feature b/tests/end2end/features/hints.feature
index a1c4d0bde..c3b857bc4 100644
--- a/tests/end2end/features/hints.feature
+++ b/tests/end2end/features/hints.feature
@@ -509,3 +509,17 @@ Feature: Using hints
         And I press the key "hello"
         And I press the key "<Enter>"
         Then data/hello.txt should be loaded
+
+    Scenario: Using --first with normal links
+        When I open data/hints/html/simple.html
+        And I hint with args "all --first"
+        Then data/hello.txt should be loaded
+
+    Scenario: Using --first with inputs
+        When I open data/hints/input.html
+        And I hint with args "inputs --first"
+        And I wait for "Entering mode KeyMode.insert (reason: clicking input)" in the log
+        # ensure we clicked the first element
+        And I run :jseval console.log(document.activeElement.id == "qute-input");
+        And I run :leave-mode
+        Then the javascript message "true" should be logged

From 707fc1176d542e8c3b280c120157ca9f538bc98c Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sat, 31 Mar 2018 11:40:51 -0400
Subject: [PATCH 13/73] Regen completion if args change.

Allow completion functions to react dynamically to args as the user
inputs them. This allows config-cycle to filter out values that were
already provided.

Args provided after the maxsplit do not cause the completion to regen.
For example, successive words typed after `:open` just set the filter
pattern and do not spuriously regenerate the completion model.
---
 qutebrowser/completion/completer.py          | 12 ++++-----
 qutebrowser/completion/models/configmodel.py | 21 ++++++++++------
 tests/unit/completion/test_completer.py      | 26 ++++++++++++++++++++
 3 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py
index 8506f3aa7..4cbdc4724 100644
--- a/qutebrowser/completion/completer.py
+++ b/qutebrowser/completion/completer.py
@@ -49,7 +49,7 @@ class Completer(QObject):
         _last_cursor_pos: The old cursor position so we avoid double completion
                           updates.
         _last_text: The old command text so we avoid double completion updates.
-        _last_completion_func: The completion function used for the last text.
+        _last_before_cursor: The prior value of before_cursor.
     """
 
     def __init__(self, *, cmd, win_id, parent=None):
@@ -62,7 +62,7 @@ class Completer(QObject):
         self._timer.timeout.connect(self._update_completion)
         self._last_cursor_pos = -1
         self._last_text = None
-        self._last_completion_func = None
+        self._last_before_cursor = None
         self._cmd.update_completion.connect(self.schedule_completion_update)
 
     def __repr__(self):
@@ -228,7 +228,7 @@ class Completer(QObject):
             # FIXME complete searches
             # https://github.com/qutebrowser/qutebrowser/issues/32
             completion.set_model(None)
-            self._last_completion_func = None
+            self._last_before_cursor = None
             return
 
         before_cursor, pattern, after_cursor = self._partition()
@@ -242,11 +242,11 @@ class Completer(QObject):
         if func is None:
             log.completion.debug('Clearing completion')
             completion.set_model(None)
-            self._last_completion_func = None
+            self._last_before_cursor = None
             return
 
-        if func != self._last_completion_func:
-            self._last_completion_func = func
+        if before_cursor != self._last_before_cursor:
+            self._last_before_cursor = before_cursor
             args = (x for x in before_cursor[1:] if not x.startswith('-'))
             with debug.log_time(log.completion, 'Starting {} completion'
                                 .format(func.__name__)):
diff --git a/qutebrowser/completion/models/configmodel.py b/qutebrowser/completion/models/configmodel.py
index b462442a0..6ee2f9566 100644
--- a/qutebrowser/completion/models/configmodel.py
+++ b/qutebrowser/completion/models/configmodel.py
@@ -47,12 +47,12 @@ def customized_option(*, info):
     return model
 
 
-def value(optname, *_values, info):
+def value(optname, *values, info):
     """A CompletionModel filled with setting values.
 
     Args:
         optname: The name of the config option this model shows.
-        _values: The values already provided on the command line.
+        values: The values already provided on the command line.
         info: A CompletionInfo instance.
     """
     model = completionmodel.CompletionModel(column_widths=(30, 70, 0))
@@ -64,13 +64,18 @@ def value(optname, *_values, info):
 
     opt = info.config.get_opt(optname)
     default = opt.typ.to_str(opt.default)
-    cur_cat = listcategory.ListCategory(
-        "Current/Default",
-        [(current, "Current value"), (default, "Default value")])
-    model.add_category(cur_cat)
+    cur_def = []
+    if current not in values:
+        cur_def.append((current, "Current value"))
+    if default not in values:
+        cur_def.append((default, "Default value"))
+    if cur_def:
+        cur_cat = listcategory.ListCategory("Current/Default", cur_def)
+        model.add_category(cur_cat)
 
-    vals = opt.typ.complete()
-    if vals is not None:
+    vals = opt.typ.complete() or []
+    vals = [x for x in vals if x[0] not in values]
+    if vals:
         model.add_category(listcategory.ListCategory("Completions", vals))
     return model
 
diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py
index 74313911f..bdc0c1cf5 100644
--- a/tests/unit/completion/test_completer.py
+++ b/tests/unit/completion/test_completer.py
@@ -223,6 +223,32 @@ def test_update_completion(txt, kind, pattern, pos_args, status_command_stub,
         completion_widget_stub.set_pattern.assert_called_once_with(pattern)
 
 
+@pytest.mark.parametrize('txt1, txt2, regen', [
+    (':config-cycle |', ':config-cycle a|', False),
+    (':config-cycle abc|', ':config-cycle abc |', True),
+    (':config-cycle abc |', ':config-cycle abc d|', False),
+    (':config-cycle abc def|', ':config-cycle abc def |', True),
+    # open has maxsplit=0, so all args just set the pattern, not the model
+    (':open |', ':open a|', False),
+    (':open abc|', ':open abc |', False),
+    (':open abc |', ':open abc d|', False),
+    (':open abc def|', ':open abc def |', False),
+])
+def test_regen_completion(txt1, txt2, regen, status_command_stub,
+                          completer_obj, completion_widget_stub, config_stub,
+                          key_config_stub):
+    """Test that the completion function is only called as needed."""
+    # set the initial state
+    _set_cmd_prompt(status_command_stub, txt1)
+    completer_obj.schedule_completion_update()
+    completion_widget_stub.set_model.reset_mock()
+
+    # "move" the cursor and check if the completion function was called
+    _set_cmd_prompt(status_command_stub, txt2)
+    completer_obj.schedule_completion_update()
+    assert completion_widget_stub.set_model.called == regen
+
+
 @pytest.mark.parametrize('before, newtxt, after', [
     (':|', 'set', ':set|'),
     (':| ', 'set', ':set|'),

From bca07eebba029870057bae66d03f2c2c001b3d25 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Sat, 31 Mar 2018 15:57:08 -0400
Subject: [PATCH 14/73] Unit-test configmodel arg filtering.

Test that values the user has already input are omitted from the
suggestions. This brings configmodel coverage back to 100%.
---
 tests/unit/completion/test_models.py | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index efc30dd1c..5db390194 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -716,6 +716,44 @@ def test_setting_value_completion_invalid(info):
     assert configmodel.value(optname='foobarbaz', info=info) is None
 
 
+@pytest.mark.parametrize('args, expected', [
+    ([], {
+        "Current/Default": [
+            ('true', 'Current value', None),
+            ('true', 'Default value', None),
+        ],
+        "Completions": [
+            ('false', '', None),
+            ('true', '', None),
+        ],
+    }),
+    (['false'], {
+        "Current/Default": [
+            ('true', 'Current value', None),
+            ('true', 'Default value', None),
+        ],
+        "Completions": [
+            ('true', '', None),
+        ],
+    }),
+    (['true'], {
+        "Completions": [
+            ('false', '', None),
+        ],
+    }),
+    (['false', 'true'], {}),
+])
+def test_setting_value_cycle(qtmodeltester, config_stub, configdata_stub,
+                             info, args, expected):
+    opt = 'content.javascript.enabled'
+
+    model = configmodel.value(opt, *args, info=info)
+    model.set_pattern('')
+    qtmodeltester.data_display_may_return_none = True
+    qtmodeltester.check(model)
+    _check_completions(model, expected)
+
+
 def test_bind_completion(qtmodeltester, cmdutils_stub, config_stub,
                          key_config_stub, configdata_stub, info):
     """Test the results of keybinding command completion.

From 423192e9c9c39a89e1db5a134025cd1ec7520c34 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sun, 1 Apr 2018 20:46:52 -0400
Subject: [PATCH 15/73] Join text arguments for :search

---
 qutebrowser/browser/commands.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index f2438cebe..201117763 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1778,14 +1778,16 @@ class CommandDispatcher:
                             replace=True)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
-                       maxsplit=0)
-    def search(self, text="", reverse=False):
+                       maxsplit=0, star_args_optional=True)
+    def search(self, *text, reverse=False):
         """Search for a text on the current page. With no text, clear results.
 
         Args:
             text: The text to search for.
             reverse: Reverse search direction.
         """
+        text = ' '.join(text)
+
         self.set_mark("'")
         tab = self._current_widget()
 

From 9ad6cef369038fa7cd012ad328dd24ec2b4e6965 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Sun, 1 Apr 2018 20:49:09 -0400
Subject: [PATCH 16/73] Add a test for leading arguments

---
 tests/end2end/data/search.html        | 1 +
 tests/end2end/features/search.feature | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/tests/end2end/data/search.html b/tests/end2end/data/search.html
index 003751cfd..fa1da96d9 100644
--- a/tests/end2end/data/search.html
+++ b/tests/end2end/data/search.html
@@ -16,6 +16,7 @@
             BAZ<br/>
             space travel<br/>
             /slash<br/>
+            -r reversed<br/>
             <a class="toselect" href="hello.txt">follow me!</a><br/>
         </p>
     </body>
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 1374b4e10..85b33c682 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -45,6 +45,12 @@ Feature: Searching on a page
         And I wait for "search found /slash" in the log
         Then "/slash" should be found
 
+    Scenario: Searching with arguments at start of search term
+        When I run :set-cmd-text -s /-r reversed
+        And I run :command-accept
+        And I wait for "search found -r reversed" in the log
+        Then "-r reversed" should be found
+
     # This doesn't work because this is QtWebKit behavior.
     @xfail_norun
     Scenario: Searching text with umlauts

From 76dbfa7305b876e15cb9337617afb2e0ec496557 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 5 Apr 2018 17:20:50 -0400
Subject: [PATCH 17/73] Allow searching for double semicolons

Possibly breaks scripts using :search with ;; to split commands. A
workaround is to put the :search command at the end.
---
 qutebrowser/browser/commands.py       | 2 +-
 tests/end2end/data/search.html        | 1 +
 tests/end2end/features/search.feature | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 201117763..9422cb002 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1778,7 +1778,7 @@ class CommandDispatcher:
                             replace=True)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
-                       maxsplit=0, star_args_optional=True)
+                       maxsplit=0, star_args_optional=True, no_cmd_split=True)
     def search(self, *text, reverse=False):
         """Search for a text on the current page. With no text, clear results.
 
diff --git a/tests/end2end/data/search.html b/tests/end2end/data/search.html
index fa1da96d9..1064a7d01 100644
--- a/tests/end2end/data/search.html
+++ b/tests/end2end/data/search.html
@@ -17,6 +17,7 @@
             space travel<br/>
             /slash<br/>
             -r reversed<br/>
+            ;; semicolons<br/>
             <a class="toselect" href="hello.txt">follow me!</a><br/>
         </p>
     </body>
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 85b33c682..2ba075868 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -51,6 +51,11 @@ Feature: Searching on a page
         And I wait for "search found -r reversed" in the log
         Then "-r reversed" should be found
 
+    Scenario: Searching with semicolons in search term
+        When I run :search ;; semi
+        And I wait for "search found ;; semi" in the log
+        Then ";; semi" should be found
+
     # This doesn't work because this is QtWebKit behavior.
     @xfail_norun
     Scenario: Searching text with umlauts

From c5334fb68367708294fe3382979a190292893074 Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Tue, 3 Apr 2018 20:29:31 +1200
Subject: [PATCH 18/73] Greasemonkey: use UrlPatterns for match directives

The greasemonkey `@match` directive is used to match urls against
chromium url patterns (as opposed to `@include` which treats its
argument as a glob expression). I was using fnmatch for both here
because I am lazy and knew someone else was going to implement chromium
url patterns for me eventually. Now it is done and I should switch to
using them instead. The most common failing case that this will fix is
something matching on `*://*.domain.com/*` because it wouldn't match
the url with no subdomain.

This codepath is only used on webengine 5.7.1 and webkit backends.
---
 qutebrowser/browser/greasemonkey.py        | 16 ++++++++++++----
 tests/unit/javascript/test_greasemonkey.py |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index a43644bf6..55a2e7356 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -32,6 +32,7 @@ from PyQt5.QtCore import pyqtSignal, QObject, QUrl
 
 from qutebrowser.utils import (log, standarddir, jinja, objreg, utils,
                                javascript)
+from qutebrowser.utils.urlmatch import UrlPattern
 from qutebrowser.commands import cmdutils
 from qutebrowser.browser import downloads
 
@@ -48,6 +49,7 @@ class GreasemonkeyScript:
     def __init__(self, properties, code):
         self._code = code
         self.includes = []
+        self.matches = []
         self.excludes = []
         self.requires = []
         self.description = None
@@ -63,8 +65,10 @@ class GreasemonkeyScript:
                 self.namespace = value
             elif name == 'description':
                 self.description = value
-            elif name in ['include', 'match']:
+            elif name == 'include':
                 self.includes.append(value)
+            elif name == 'match':
+                self.matches.append(value)
             elif name in ['exclude', 'exclude_match']:
                 self.excludes.append(value)
             elif name == 'run-at':
@@ -92,7 +96,7 @@ class GreasemonkeyScript:
             props = ""
         script = cls(re.findall(cls.PROPS_REGEX, props), source)
         script.script_meta = props
-        if not script.includes:
+        if not script.includes and not script.matches:
             script.includes = ['*']
         return script
 
@@ -117,7 +121,7 @@ class GreasemonkeyScript:
         return json.dumps({
             'name': self.name,
             'description': self.description,
-            'matches': self.includes,
+            'matches': self.matches,
             'includes': self.includes,
             'excludes': self.excludes,
             'run-at': self.run_at,
@@ -324,8 +328,12 @@ class GreasemonkeyManager(QObject):
             # Otherwise they are glob expressions.
             return fnmatch.fnmatch(string_url, pattern)
 
+        def _chromium_match(pattern):
+            return UrlPattern(pattern).matches(url)
+
         tester = (lambda script:
-                  any(_match(pat) for pat in script.includes) and
+                  (any(_match(pat) for pat in script.includes) or
+                   any(_chromium_match(pat) for pat in script.matches)) and
                   not any(_match(pat) for pat in script.excludes))
 
         return MatchingScripts(
diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py
index 7759f5d18..8701e8170 100644
--- a/tests/unit/javascript/test_greasemonkey.py
+++ b/tests/unit/javascript/test_greasemonkey.py
@@ -32,7 +32,7 @@ test_gm_script = r"""
 // @name qutebrowser test userscript
 // @namespace invalid.org
 // @include http://localhost:*/data/title.html
-// @match http://trolol*
+// @match http://*.trolol.com/*
 // @exclude https://badhost.xxx/*
 // @run-at document-start
 // ==/UserScript==
@@ -60,7 +60,7 @@ def test_all():
 
 @pytest.mark.parametrize("url, expected_matches", [
     # included
-    ('http://trololololololo.com/', 1),
+    ('http://trolol.com/', 1),
     # neither included nor excluded
     ('http://aaaaaaaaaa.com/', 0),
     # excluded

From 646e92707a3707d87e5d4ac8b5d251c5780c5068 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 16 Apr 2018 23:15:56 -0400
Subject: [PATCH 19/73] Call search command directly instead of using arguments

---
 qutebrowser/browser/commands.py             |  6 ++---
 qutebrowser/mainwindow/statusbar/command.py | 28 +++++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 9422cb002..f2438cebe 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -1778,16 +1778,14 @@ class CommandDispatcher:
                             replace=True)
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
-                       maxsplit=0, star_args_optional=True, no_cmd_split=True)
-    def search(self, *text, reverse=False):
+                       maxsplit=0)
+    def search(self, text="", reverse=False):
         """Search for a text on the current page. With no text, clear results.
 
         Args:
             text: The text to search for.
             reverse: Reverse search direction.
         """
-        text = ' '.join(text)
-
         self.set_mark("'")
         tab = self._current_widget()
 
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 681e20ac5..8829cc9fe 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -69,6 +69,13 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.textChanged.connect(self.updateGeometry)
         self.textChanged.connect(self._incremental_search)
 
+        search_fn = cmdutils.cmd_dict['search'].run
+        self.search_prefixes = {
+            '/': lambda search: search_fn(self._win_id, ["--", search]),
+            '?': lambda search: search_fn(self._win_id, ["-r", "--", search]),
+        }
+
+
     def prefix(self):
         """Get the currently entered command prefix."""
         text = self.text()
@@ -162,17 +169,17 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         Args:
             rapid: Run the command without closing or clearing the command bar.
         """
-        prefixes = {
-            ':': '',
-            '/': 'search -- ',
-            '?': 'search -r -- ',
-        }
         text = self.text()
         self.history.append(text)
         if not rapid:
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'cmd accept')
-        self.got_cmd[str].emit(prefixes[text[0]] + text[1:])
+
+        prefix = text[0]
+        if prefix in self.search_prefixes:
+            self.search_prefixes[prefix](text[1:])
+        else:
+            self.got_cmd[str].emit(text[1:])
 
     @cmdutils.register(instance='status-command', scope='window')
     def edit_command(self, run=False):
@@ -258,10 +265,5 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         if not config.val.search.incremental:
             return
 
-        search_prefixes = {
-            '/': 'search -- ',
-            '?': 'search -r -- ',
-        }
-
-        if self.prefix() in ['/', '?']:
-            self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])
+        if self.prefix() in self.search_prefixes:
+            self.search_prefixes[self.prefix()](text[1:])

From cbb246fd0b30009e7d898c6598fd121fa6eac519 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 16 Apr 2018 23:27:06 -0400
Subject: [PATCH 20/73] Update tests for new implementation

---
 qutebrowser/mainwindow/statusbar/command.py |  1 -
 tests/end2end/features/search.feature       | 10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 8829cc9fe..dc1df34c2 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -75,7 +75,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             '?': lambda search: search_fn(self._win_id, ["-r", "--", search]),
         }
 
-
     def prefix(self):
         """Get the currently entered command prefix."""
         text = self.text()
diff --git a/tests/end2end/features/search.feature b/tests/end2end/features/search.feature
index 2ba075868..568831c0d 100644
--- a/tests/end2end/features/search.feature
+++ b/tests/end2end/features/search.feature
@@ -40,19 +40,23 @@ Feature: Searching on a page
         Then "space " should be found
 
     Scenario: Searching with / and slash in search term (issue 507)
-        When I run :set-cmd-text -s //slash
+        When I run :set-cmd-text //slash
         And I run :command-accept
         And I wait for "search found /slash" in the log
         Then "/slash" should be found
 
     Scenario: Searching with arguments at start of search term
-        When I run :set-cmd-text -s /-r reversed
+        When I run :set-cmd-text /-r reversed
         And I run :command-accept
         And I wait for "search found -r reversed" in the log
         Then "-r reversed" should be found
 
     Scenario: Searching with semicolons in search term
-        When I run :search ;; semi
+        When I run :set-cmd-text /;
+        And I run :fake-key -g ;
+        And I run :fake-key -g <space>
+        And I run :fake-key -g semi
+        And I run :command-accept
         And I wait for "search found ;; semi" in the log
         Then ";; semi" should be found
 

From 1d2dd5bf55ec42f0fec92634a9472432c3342853 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 19 Apr 2018 21:16:33 -0400
Subject: [PATCH 21/73] Use CommandDispatcher directly for / searches

---
 qutebrowser/mainwindow/statusbar/command.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index dc1df34c2..61b9fb43a 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -19,6 +19,8 @@
 
 """The commandline in the statusbar."""
 
+import functools
+
 from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QSize
 from PyQt5.QtWidgets import QSizePolicy
 
@@ -69,10 +71,12 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.textChanged.connect(self.updateGeometry)
         self.textChanged.connect(self._incremental_search)
 
-        search_fn = cmdutils.cmd_dict['search'].run
+        dispatcher = objreg.get('command-dispatcher',
+                                scope='window', window=self._win_id)
+        search_fn = dispatcher.search
         self.search_prefixes = {
-            '/': lambda search: search_fn(self._win_id, ["--", search]),
-            '?': lambda search: search_fn(self._win_id, ["-r", "--", search]),
+            '/': search_fn,
+            '?': functools.partial(search_fn, reverse=True)
         }
 
     def prefix(self):

From c2472d88f19b78c8a8110d71e83b762322d9565b Mon Sep 17 00:00:00 2001
From: cryzed <cryzed@googlemail.com>
Date: Fri, 20 Apr 2018 18:21:55 +0200
Subject: [PATCH 22/73] qute-pass: Escape backslashes, so that they are
 inserted correctly

---
 misc/userscripts/qute-pass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/misc/userscripts/qute-pass b/misc/userscripts/qute-pass
index 5bab9db93..3312c6cc9 100755
--- a/misc/userscripts/qute-pass
+++ b/misc/userscripts/qute-pass
@@ -158,6 +158,9 @@ def main(arguments):
         return ExitCodes.COULD_NOT_MATCH_PASSWORD
     password = match.group(1)
 
+    # Escape backslash so that they are inserted correctly
+    password = password.replace('\\', '\\\\')
+
     insert_mode = ';; enter-mode insert' if arguments.insert_mode else ''
     if arguments.username_only:
         qute_command('fake-key {}{}'.format(username, insert_mode))

From 2de64288300fd2380d0ec1140ba8b6ca6d55d8e1 Mon Sep 17 00:00:00 2001
From: cryzed <cryzed@googlemail.com>
Date: Fri, 20 Apr 2018 18:23:50 +0200
Subject: [PATCH 23/73] qute-pass: Also escape backslashes in the username

---
 misc/userscripts/qute-pass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/misc/userscripts/qute-pass b/misc/userscripts/qute-pass
index 3312c6cc9..4eddaf54c 100755
--- a/misc/userscripts/qute-pass
+++ b/misc/userscripts/qute-pass
@@ -150,6 +150,7 @@ def main(arguments):
         stderr('Failed to match username pattern on {}!'.format(arguments.username_target))
         return ExitCodes.COULD_NOT_MATCH_USERNAME
     username = match.group(1)
+    username = username.replace('\\', '\\\\')
 
     # Match password
     match = re.match(arguments.password_pattern, secret)
@@ -157,8 +158,6 @@ def main(arguments):
         stderr('Failed to match password pattern on secret!')
         return ExitCodes.COULD_NOT_MATCH_PASSWORD
     password = match.group(1)
-
-    # Escape backslash so that they are inserted correctly
     password = password.replace('\\', '\\\\')
 
     insert_mode = ';; enter-mode insert' if arguments.insert_mode else ''

From e2d249541d22c7c8ffd84908e5d111ed7e84c4b3 Mon Sep 17 00:00:00 2001
From: Michal Siedlaczek <michal.siedlaczek@nyu.edu>
Date: Sat, 21 Apr 2018 12:33:10 -0400
Subject: [PATCH 24/73] Fix test function comment

---
 tests/unit/browser/webengine/test_spell.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/unit/browser/webengine/test_spell.py b/tests/unit/browser/webengine/test_spell.py
index faccd7745..e8ce3cecc 100644
--- a/tests/unit/browser/webengine/test_spell.py
+++ b/tests/unit/browser/webengine/test_spell.py
@@ -75,8 +75,9 @@ def test_local_filename_dictionary_installed(tmpdir, monkeypatch):
 
 
 def test_local_filename_installed_malformed(tmpdir, monkeypatch, caplog):
-    """Tests retrieving local filename when the dict installed and another
-    file is malformed."""
+    """Tests retrieving local filename when the dict installed.
+
+    In this usecase, another existing file is malformed."""
     monkeypatch.setattr(spell, 'dictionary_dir', lambda: str(tmpdir))
     for lang_file in ['en-US-11-0.bdic', 'en-US-7-1.bdic', 'en-US.bdic']:
         (tmpdir / lang_file).ensure()

From 6825dfb8d8706a14980f66ca7b3519a631d08c6f Mon Sep 17 00:00:00 2001
From: cryzed <cryzed@googlemail.com>
Date: Mon, 23 Apr 2018 19:01:12 +0200
Subject: [PATCH 25/73] qute-pass: Fake strings letter-by-letter to avoid
 issues

---
 misc/userscripts/qute-pass | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/misc/userscripts/qute-pass b/misc/userscripts/qute-pass
index 4eddaf54c..fbe49a48a 100755
--- a/misc/userscripts/qute-pass
+++ b/misc/userscripts/qute-pass
@@ -109,6 +109,11 @@ def dmenu(items, invocation, encoding):
     return process.stdout.decode(encoding).strip()
 
 
+def fake_key_raw(text):
+    for character in text:
+        qute_command(f'fake-key {character}')
+
+
 def main(arguments):
     if not arguments.url:
         argument_parser.print_help()
@@ -150,7 +155,6 @@ def main(arguments):
         stderr('Failed to match username pattern on {}!'.format(arguments.username_target))
         return ExitCodes.COULD_NOT_MATCH_USERNAME
     username = match.group(1)
-    username = username.replace('\\', '\\\\')
 
     # Match password
     match = re.match(arguments.password_pattern, secret)
@@ -158,17 +162,20 @@ def main(arguments):
         stderr('Failed to match password pattern on secret!')
         return ExitCodes.COULD_NOT_MATCH_PASSWORD
     password = match.group(1)
-    password = password.replace('\\', '\\\\')
 
-    insert_mode = ';; enter-mode insert' if arguments.insert_mode else ''
     if arguments.username_only:
-        qute_command('fake-key {}{}'.format(username, insert_mode))
+        fake_key_raw(username)
     elif arguments.password_only:
-        qute_command('fake-key {}{}'.format(password, insert_mode))
+        fake_key_raw(password)
     else:
         # Enter username and password using fake-key and <Tab> (which seems to work almost universally), then switch
         # back into insert-mode, so the form can be directly submitted by hitting enter afterwards
-        qute_command('fake-key {} ;; fake-key <Tab> ;; fake-key {}{}'.format(username, password, insert_mode))
+        fake_key_raw(username)
+        qute_command('fake-key <Tab>')
+        fake_key_raw(password)
+
+    if arguments.insert_mode:
+        qute_command('enter-mode insert')
 
     return ExitCodes.SUCCESS
 

From 92aedf84f57123a42b82d45ff5823abd56729754 Mon Sep 17 00:00:00 2001
From: cryzed <cryzed@googlemail.com>
Date: Mon, 23 Apr 2018 19:16:51 +0200
Subject: [PATCH 26/73] qute-pass: Don't use f-strings

---
 misc/userscripts/qute-pass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/userscripts/qute-pass b/misc/userscripts/qute-pass
index fbe49a48a..fc897be07 100755
--- a/misc/userscripts/qute-pass
+++ b/misc/userscripts/qute-pass
@@ -111,7 +111,7 @@ def dmenu(items, invocation, encoding):
 
 def fake_key_raw(text):
     for character in text:
-        qute_command(f'fake-key {character}')
+        qute_command('fake-key {}'.format(character))
 
 
 def main(arguments):

From 801e9e0334dcc58cbe52b936951d93c1e3c1e3c7 Mon Sep 17 00:00:00 2001
From: cryzed <cryzed@googlemail.com>
Date: Sun, 29 Apr 2018 15:22:52 +0200
Subject: [PATCH 27/73] qute-pass: Improve fake_key_raw()

---
 misc/userscripts/qute-pass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/misc/userscripts/qute-pass b/misc/userscripts/qute-pass
index fc897be07..892f9c5da 100755
--- a/misc/userscripts/qute-pass
+++ b/misc/userscripts/qute-pass
@@ -111,7 +111,9 @@ def dmenu(items, invocation, encoding):
 
 def fake_key_raw(text):
     for character in text:
-        qute_command('fake-key {}'.format(character))
+        # Escape all characters by default, space requires special handling
+        sequence = '" "' if character == ' ' else '\{}'.format(character)
+        qute_command('fake-key {}'.format(sequence))
 
 
 def main(arguments):

From b9c8a79f10c7697c6dac9e529b4aae27bae55179 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 30 Apr 2018 18:29:13 +0200
Subject: [PATCH 28/73] Update flake8-builtins from 1.3.0 to 1.3.1

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index ba4b9640e..0a13c054c 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -3,7 +3,7 @@
 attrs==17.4.0
 flake8==3.5.0
 flake8-bugbear==18.2.0
-flake8-builtins==1.3.0
+flake8-builtins==1.3.1
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0
 flake8-debugger==3.1.0

From bdc0c0ddc1c6950ccc5562ae5e8720308a99258f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 30 Apr 2018 18:29:14 +0200
Subject: [PATCH 29/73] Update setuptools from 39.0.1 to 39.1.0

---
 misc/requirements/requirements-pip.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-pip.txt b/misc/requirements/requirements-pip.txt
index b1c6271f0..60f24f057 100644
--- a/misc/requirements/requirements-pip.txt
+++ b/misc/requirements/requirements-pip.txt
@@ -3,6 +3,6 @@
 appdirs==1.4.3
 packaging==17.1
 pyparsing==2.2.0
-setuptools==39.0.1
+setuptools==39.1.0
 six==1.11.0
 wheel==0.31.0

From 1c3ee0db207c04e2eef5c9fca0598b44e4571c05 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 30 Apr 2018 18:29:16 +0200
Subject: [PATCH 30/73] Update flask from 0.12.2 to 1.0.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 49465dd4e..02fd07123 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -8,7 +8,7 @@ click==6.7
 coverage==4.5.1
 EasyProcess==0.2.3
 fields==5.0.0
-Flask==0.12.2
+Flask==1.0.1
 glob2==0.6
 hunter==2.0.2
 hypothesis==3.56.5

From 432d666d25dad875cab54479b36a9fc9d01c8a6f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 30 Apr 2018 18:29:17 +0200
Subject: [PATCH 31/73] Update pytest from 3.5.0 to 3.5.1

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 02fd07123..4fc2cd6a3 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -22,7 +22,7 @@ parse-type==0.4.2
 pluggy==0.6.0
 py==1.5.3
 py-cpuinfo==4.0.0
-pytest==3.5.0
+pytest==3.5.1
 pytest-bdd==2.21.0
 pytest-benchmark==3.1.1
 pytest-cov==2.5.1

From d16d9e403a32e579d156a3f6c922db00b939e650 Mon Sep 17 00:00:00 2001
From: toofar <jimmy@spalge.com>
Date: Wed, 2 May 2018 20:30:28 +1200
Subject: [PATCH 32/73] Make HTTPClient follow redirects by default.

Closes #3875

The autoupdator, which uses `qutebrowser.misc.httpclient` has been failing recently because the URL that it hits to check version information is now serving a 301 moved permanently. By default QNetworkRequest doesn't follow redirects so it was getting back a (non-json, despite the request) body pointing to the new location, instead or version information. This changes fixes that by changing HTTPClient to use a QNetworkRequest subclass which follows redirects by default.

It lookes like HTTPClient is currently only used in autoupdate.py, version.py, and crashdialog.py so I don't expect any breakage.

5.6-5.8 Only had a boolean setting available which allows redirects, but not from the https scheme to http, 5.9 introduces a more nuanced setting. I have tested locally on 5.7.1 and 5.10.
---
 qutebrowser/misc/httpclient.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/httpclient.py b/qutebrowser/misc/httpclient.py
index b0b41af76..0b162befd 100644
--- a/qutebrowser/misc/httpclient.py
+++ b/qutebrowser/misc/httpclient.py
@@ -28,6 +28,21 @@ from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkRequest,
                              QNetworkReply)
 
 
+class HTTPRequest(QNetworkRequest):
+    """A QNetworkRquest that follows (secure) redirects by default."""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        try:
+            self.setAttribute(QNetworkRequest.RedirectPolicyAttribute,
+                              QNetworkRequest.NoLessSafeRedirectPolicy)
+        except AttributeError:
+            # RedirectPolicyAttribute was introduced in 5.9 to replace
+            # FollowRedirectsAttribute.
+            self.setAttribute(QNetworkRequest.FollowRedirectsAttribute,
+                              True)
+
+
 class HTTPClient(QObject):
 
     """An HTTP client based on QNetworkAccessManager.
@@ -63,7 +78,7 @@ class HTTPClient(QObject):
         if data is None:
             data = {}
         encoded_data = urllib.parse.urlencode(data).encode('utf-8')
-        request = QNetworkRequest(url)
+        request = HTTPRequest(url)
         request.setHeader(QNetworkRequest.ContentTypeHeader,
                           'application/x-www-form-urlencoded;charset=utf-8')
         reply = self._nam.post(request, encoded_data)
@@ -77,7 +92,7 @@ class HTTPClient(QObject):
         Args:
             url: The URL to access, as QUrl.
         """
-        request = QNetworkRequest(url)
+        request = HTTPRequest(url)
         reply = self._nam.get(request)
         self._handle_reply(reply)
 

From 19554ba4a13f7e75ad5b4b338f8dbb80f9b9e50c Mon Sep 17 00:00:00 2001
From: Jimmy <jimmy@spalge.com>
Date: Wed, 2 May 2018 20:51:02 +1200
Subject: [PATCH 33/73] Update PyPI api URL.

Flask 1.0 is out, pip made breaking changes, warehouse is a thing, new
requests soon. So
much fun in python world lately.
---
 qutebrowser/misc/autoupdate.py     | 2 +-
 tests/unit/misc/test_autoupdate.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qutebrowser/misc/autoupdate.py b/qutebrowser/misc/autoupdate.py
index d056d61b6..d223bd366 100644
--- a/qutebrowser/misc/autoupdate.py
+++ b/qutebrowser/misc/autoupdate.py
@@ -45,7 +45,7 @@ class PyPIVersionClient(QObject):
                arg: The error message, as string.
     """
 
-    API_URL = 'https://pypi.python.org/pypi/{}/json'
+    API_URL = 'https://pypi.org/pypi/{}/json'
     success = pyqtSignal(str)
     error = pyqtSignal(str)
 
diff --git a/tests/unit/misc/test_autoupdate.py b/tests/unit/misc/test_autoupdate.py
index 4f5a9dc0e..d4a69a115 100644
--- a/tests/unit/misc/test_autoupdate.py
+++ b/tests/unit/misc/test_autoupdate.py
@@ -67,7 +67,7 @@ def test_get_version_success(qtbot):
         with qtbot.waitSignal(client.success):
             client.get_version('test')
 
-    assert http_stub.url == QUrl('https://pypi.python.org/pypi/test/json')
+    assert http_stub.url == QUrl(client.API_URL.format('test'))
 
 
 def test_get_version_error(qtbot):

From 3cc790afb329757f061833f80e221ad2e503bae3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 09:10:14 +0200
Subject: [PATCH 34/73] Update changelog

---
 doc/changelog.asciidoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3ce0928c8..d9ed690fe 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -81,7 +81,9 @@ Fixed
 - The Makefile (intended for packagers) now supports `PREFIX` properly.
 - The workaround for a black window with Nvidia graphics is now enabled on
   non-Linux systems (like FreeBSD) as well.
-- Initial support for Qt 5.11
+- Initial support for Qt 5.11.
+- Checking for a new version after sending a crash report now works properly
+  again.
 
 v1.2.1
 ------

From 4adf10a2f2160ac088330deede54c91f3d799e38 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 09:13:48 +0200
Subject: [PATCH 35/73] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index d9ed690fe..42a0822e0 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -84,6 +84,8 @@ Fixed
 - Initial support for Qt 5.11.
 - Checking for a new version after sending a crash report now works properly
   again.
+- The `qute-pass` userscript now handles special chars in usernames/passwords
+  properly.
 
 v1.2.1
 ------

From 2b5f1337261ac7e395db540e9a6b88c0a3067773 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 13:23:07 +0200
Subject: [PATCH 36/73] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 42a0822e0..e2c1aa1e2 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -26,6 +26,7 @@ Added
   search term is given.
 - New `tabs.min_width` setting to configure the minimal width for tabs.
 - New `getbib` userscript to download bibtex information for DOIs on a page.
+- New `qute-keepass` userscript to get passwords from KeePassX.
 
 Changed
 ~~~~~~~

From a70f864ff5686787b2ae6851922f1dd9c67ffd60 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 13:33:53 +0200
Subject: [PATCH 37/73] Update changelog

---
 doc/changelog.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index e2c1aa1e2..38f6bb7e4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -87,6 +87,8 @@ Fixed
   again.
 - The `qute-pass` userscript now handles special chars in usernames/passwords
   properly.
+- `@match` in Greasemonkey scripts now more closely matches the proper pattern
+  syntax.
 
 v1.2.1
 ------

From 106e591a36ec1f7d6e3e1aade373e2b18980e5db Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 13:53:10 +0200
Subject: [PATCH 38/73] Refactor matching of Greasemonkey scripts

---
 qutebrowser/browser/greasemonkey.py | 78 +++++++++++++++++------------
 1 file changed, 46 insertions(+), 32 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 55a2e7356..468f123d3 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -31,8 +31,7 @@ import attr
 from PyQt5.QtCore import pyqtSignal, QObject, QUrl
 
 from qutebrowser.utils import (log, standarddir, jinja, objreg, utils,
-                               javascript)
-from qutebrowser.utils.urlmatch import UrlPattern
+                               javascript, urlmatch)
 from qutebrowser.commands import cmdutils
 from qutebrowser.browser import downloads
 
@@ -147,6 +146,42 @@ class MatchingScripts(object):
     idle = attr.ib(default=attr.Factory(list))
 
 
+class GreasemonkeyMatcher:
+
+    """Check whether scripts should be loaded for a given URL."""
+
+    # https://wiki.greasespot.net/Include_and_exclude_rules#Greaseable_schemes
+    # Limit the schemes scripts can run on due to unreasonable levels of
+    # exploitability
+    GREASEABLE_SCHEMES = ['http', 'https', 'ftp', 'file']
+
+    def __init__(self, url):
+        self._url = url
+        self._url_string = url.toString(QUrl.FullyEncoded)
+        self.is_greaseable = url.scheme() in self.GREASEABLE_SCHEMES
+
+    def _match_pattern(self, pattern):
+        # For include and exclude rules if they start and end with '/' they
+        # should be treated as a (ecma syntax) regular expression.
+        if pattern.startswith('/') and pattern.endswith('/'):
+            matches = re.search(pattern[1:-1], self._url_string, flags=re.I)
+            return matches is not None
+
+        # Otherwise they are glob expressions.
+        return fnmatch.fnmatch(self._url_string, pattern)
+
+    def matches(self, script):
+        """Check whether the URL matches filtering rules of the given script."""
+        assert self.is_greaseable
+        matching_includes = any(self._match_pattern(pat)
+                                for pat in script.includes)
+        matching_match = any(urlmatch.UrlPattern(pat).matches(self._url)
+                             for pat in script.matches)
+        matching_excludes = any(self._match_pattern(pat)
+                                for pat in script.excludes)
+        return (matching_includes or matching_match) and not matching_excludes
+
+
 class GreasemonkeyManager(QObject):
 
     """Manager of userscripts and a Greasemonkey compatible environment.
@@ -158,10 +193,6 @@ class GreasemonkeyManager(QObject):
     """
 
     scripts_reloaded = pyqtSignal()
-    # https://wiki.greasespot.net/Include_and_exclude_rules#Greaseable_schemes
-    # Limit the schemes scripts can run on due to unreasonable levels of
-    # exploitability
-    greaseable_schemes = ['http', 'https', 'ftp', 'file']
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -313,34 +344,17 @@ class GreasemonkeyManager(QObject):
         returns a tuple of lists of scripts meant to run at (document-start,
         document-end, document-idle)
         """
-        if url.scheme() not in self.greaseable_schemes:
+        matcher = GreasemonkeyMatcher(url)
+        if not matcher.is_greaseable:
             return MatchingScripts(url, [], [], [])
-
-        string_url = url.toString(QUrl.FullyEncoded)
-
-        def _match(pattern):
-            # For include and exclude rules if they start and end with '/' they
-            # should be treated as a (ecma syntax) regular expression.
-            if pattern.startswith('/') and pattern.endswith('/'):
-                matches = re.search(pattern[1:-1], string_url, flags=re.I)
-                return matches is not None
-
-            # Otherwise they are glob expressions.
-            return fnmatch.fnmatch(string_url, pattern)
-
-        def _chromium_match(pattern):
-            return UrlPattern(pattern).matches(url)
-
-        tester = (lambda script:
-                  (any(_match(pat) for pat in script.includes) or
-                   any(_chromium_match(pat) for pat in script.matches)) and
-                  not any(_match(pat) for pat in script.excludes))
-
         return MatchingScripts(
-            url,
-            [script for script in self._run_start if tester(script)],
-            [script for script in self._run_end if tester(script)],
-            [script for script in self._run_idle if tester(script)]
+            url=url,
+            start=[script for script in self._run_start
+                   if matcher.matches(script)],
+            end=[script for script in self._run_end
+                 if matcher.matches(script)],
+            idle=[script for script in self._run_idle
+                  if matcher.matches(script)]
         )
 
     def all_scripts(self):

From 6eb8284fe05f9d97573d18ac205d4d83ff375cd0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 13:58:59 +0200
Subject: [PATCH 39/73] Refactor handling search in command.py

---
 qutebrowser/mainwindow/statusbar/command.py | 33 +++++++++++++--------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index 61b9fb43a..c0e3e095d 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -71,13 +71,25 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         self.textChanged.connect(self.updateGeometry)
         self.textChanged.connect(self._incremental_search)
 
-        dispatcher = objreg.get('command-dispatcher',
-                                scope='window', window=self._win_id)
-        search_fn = dispatcher.search
-        self.search_prefixes = {
-            '/': search_fn,
-            '?': functools.partial(search_fn, reverse=True)
+        self._command_dispatcher = objreg.get(
+            'command-dispatcher', scope='window', window=self._win_id)
+
+    def _handle_search(self):
+        """Check if the currently entered text is a search, and if so, run it.
+
+        Return:
+            True if a search was executed, False otherwise.
+        """
+        search_prefixes = {
+            '/': self._command_dispatcher.search,
+            '?': functools.partial(
+                self._command_dispatcher.search, reverse=True)
         }
+        if self.prefix() in search_prefixes:
+            search_fn = search_prefixes[self.prefix()]
+            search_fn(self.text()[1:])
+            return True
+        return False
 
     def prefix(self):
         """Get the currently entered command prefix."""
@@ -178,10 +190,8 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'cmd accept')
 
-        prefix = text[0]
-        if prefix in self.search_prefixes:
-            self.search_prefixes[prefix](text[1:])
-        else:
+        was_search = self._handle_search()
+        if not was_search:
             self.got_cmd[str].emit(text[1:])
 
     @cmdutils.register(instance='status-command', scope='window')
@@ -268,5 +278,4 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         if not config.val.search.incremental:
             return
 
-        if self.prefix() in self.search_prefixes:
-            self.search_prefixes[self.prefix()](text[1:])
+        self._handle_search()

From 80778a9ff3ba4b16192cde6fb89f1036b1df6573 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 14:04:13 +0200
Subject: [PATCH 40/73] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 38f6bb7e4..1eeaa49f9 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -89,6 +89,7 @@ Fixed
   properly.
 - `@match` in Greasemonkey scripts now more closely matches the proper pattern
   syntax.
+- Searching via `/` or `?` now doesn't handle any characters in a special way.
 
 v1.2.1
 ------

From 2b6b4e82a7c65683483032e922a0683e87b5db18 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 14:45:55 +0200
Subject: [PATCH 41/73] Handle event_target() being None

As a stop-gap solution for #3888
---
 qutebrowser/browser/browsertab.py             | 6 ++++++
 qutebrowser/browser/webengine/webenginetab.py | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py
index aea15a257..2a9662eef 100644
--- a/qutebrowser/browser/browsertab.py
+++ b/qutebrowser/browser/browsertab.py
@@ -724,7 +724,13 @@ class AbstractTab(QWidget):
         if getattr(evt, 'posted', False):
             raise utils.Unreachable("Can't re-use an event which was already "
                                     "posted!")
+
         recipient = self.event_target()
+        if recipient is None:
+            # https://github.com/qutebrowser/qutebrowser/issues/3888
+            log.webview.warning("Unable to find event target!")
+            return
+
         evt.posted = True
         QApplication.postEvent(recipient, evt)
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 145bc9c44..33a394d3f 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -1104,6 +1104,4 @@ class WebEngineTab(browsertab.AbstractTab):
         self.predicted_navigation.connect(self._on_predicted_navigation)
 
     def event_target(self):
-        fp = self._widget.focusProxy()
-        assert fp is not None
-        return fp
+        return self._widget.focusProxy()

From 979b7cfaba13fa064d96594390c4239a0e3e80c1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 14:52:10 +0200
Subject: [PATCH 42/73] Add a stop-gap solution for AssertionError when
 retrying downloads

See #3847
---
 doc/changelog.asciidoc                              | 1 +
 qutebrowser/browser/webengine/webenginedownloads.py | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 1eeaa49f9..3af81d441 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -90,6 +90,7 @@ Fixed
 - `@match` in Greasemonkey scripts now more closely matches the proper pattern
   syntax.
 - Searching via `/` or `?` now doesn't handle any characters in a special way.
+- Fixed crash when trying to retry some failed downloads on QtWebEngine.
 
 v1.2.1
 ------
diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index 7c702a56f..68e151959 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -101,7 +101,11 @@ class DownloadItem(downloads.AbstractDownloadItem):
 
     def retry(self):
         state = self._qt_item.state()
-        assert state == QWebEngineDownloadItem.DownloadInterrupted, state
+        if state != QWebEngineDownloadItem.DownloadInterrupted:
+            log.downloads.warning(
+                "Trying to retry download in state {}".format(
+                    debug.qenum_key(QWebEngineDownloadItem, state)))
+            return
 
         try:
             self._qt_item.resume()

From 626abd3c83b3a985774d2065673f405ea4f1939d Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 15:18:21 +0200
Subject: [PATCH 43/73] Fix lint

---
 qutebrowser/browser/greasemonkey.py         | 2 +-
 qutebrowser/mainwindow/statusbar/command.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py
index 468f123d3..578830793 100644
--- a/qutebrowser/browser/greasemonkey.py
+++ b/qutebrowser/browser/greasemonkey.py
@@ -171,7 +171,7 @@ class GreasemonkeyMatcher:
         return fnmatch.fnmatch(self._url_string, pattern)
 
     def matches(self, script):
-        """Check whether the URL matches filtering rules of the given script."""
+        """Check whether the URL matches filtering rules of the script."""
         assert self.is_greaseable
         matching_includes = any(self._match_pattern(pat)
                                 for pat in script.includes)
diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index c0e3e095d..bb5c60b38 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -273,8 +273,8 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         width = self.fontMetrics().width(text)
         return QSize(width, height)
 
-    @pyqtSlot(str)
-    def _incremental_search(self, text):
+    @pyqtSlot()
+    def _incremental_search(self):
         if not config.val.search.incremental:
             return
 

From acdf0a1c606688b566a1c393ad7ec05566bc4e7f Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 15:23:45 +0200
Subject: [PATCH 44/73] Call _handle_search before leaving the mode

---
 qutebrowser/mainwindow/statusbar/command.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py
index bb5c60b38..c04dab03e 100644
--- a/qutebrowser/mainwindow/statusbar/command.py
+++ b/qutebrowser/mainwindow/statusbar/command.py
@@ -186,11 +186,13 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
         """
         text = self.text()
         self.history.append(text)
+
+        was_search = self._handle_search()
+
         if not rapid:
             modeman.leave(self._win_id, usertypes.KeyMode.command,
                           'cmd accept')
 
-        was_search = self._handle_search()
         if not was_search:
             self.got_cmd[str].emit(text[1:])
 

From 68794cc2e27b8d7028481a8128a7738271071dc9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 15:25:41 +0200
Subject: [PATCH 45/73] Revert "Always set FocusOnNavigationEnabled"

This reverts commit fa41af63b67b007a67cbac1b119729d030b9e533.

See #3661
Fixes #3872
---
 .../browser/webengine/webenginesettings.py       | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index da4b2b534..417465929 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -176,24 +176,12 @@ class ProfileSetter:
         """Initialize settings on the given profile."""
         self.set_http_headers()
         self.set_http_cache_size()
-        self._init_attributes()
-
+        self._profile.settings().setAttribute(
+            QWebEngineSettings.FullScreenSupportEnabled, True)
         if qtutils.version_check('5.8'):
             self._profile.setSpellCheckEnabled(True)
             self.set_dictionary_language()
 
-    def _init_attributes(self):
-        """Initialize hard-coded attributes."""
-        values = {
-            'FullScreenSupportEnabled': True,
-            'FocusOnNavigationEnabled': True,
-        }
-        settings = self._profile.settings()
-        for name, value in values.items():
-            attr = getattr(QWebEngineSettings, name, None)
-            if attr is not None:
-                settings.setAttribute(attr, value)
-
     def set_http_headers(self):
         """Set the user agent and accept-language for the given profile.
 

From 2663feea2f50bd2c5f719c5dc914bfff185d37ba Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Thu, 3 May 2018 11:37:31 -0400
Subject: [PATCH 46/73] Add :hint inputs --first as a default binding to gi

---
 qutebrowser/config/configdata.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 7034d030c..1784e4b7d 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -2271,6 +2271,7 @@ bindings.default:
       ;R: hint --rapid links window
       ;d: hint links download
       ;t: hint inputs
+      gi: hint inputs --first
       h: scroll left
       j: scroll down
       k: scroll up

From ae295a7f652ed851ac8b258aa10500d72e6a52b6 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 17:15:41 +0200
Subject: [PATCH 47/73] Call setFocus() when navigating

See #3661:
https://github.com/qutebrowser/qutebrowser/issues/3661#issuecomment-386308601
This doesn't seem to fully fix this, but at least the top four failed tests
there...

This should not regress #3872. Might affect #3834 in some way.
---
 qutebrowser/browser/webengine/webenginetab.py | 2 ++
 qutebrowser/mainwindow/tabbedbrowser.py       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 33a394d3f..623ccc196 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -780,6 +780,8 @@ class WebEngineTab(browsertab.AbstractTab):
             url: The QUrl to open.
             predict: If set to False, predicted_navigation is not emitted.
         """
+        # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68076
+        self._widget.setFocus()
         self._saved_zoom = self.zoom.factor()
         self._openurl_prepare(url, predict=predict)
         self._widget.load(url)
diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py
index ce36f0038..2d674e280 100644
--- a/qutebrowser/mainwindow/tabbedbrowser.py
+++ b/qutebrowser/mainwindow/tabbedbrowser.py
@@ -489,6 +489,8 @@ class TabbedBrowser(QWidget):
                                                self.widget.count())
         else:
             self.widget.setCurrentWidget(tab)
+            # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-68076
+            tab.setFocus()
 
         tab.show()
         self.new_tab.emit(tab, idx)

From f528a5dd21573ad439bc98ba077df182104b2736 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 17:56:24 +0200
Subject: [PATCH 48/73] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3af81d441..d1536471d 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -91,6 +91,7 @@ Fixed
   syntax.
 - Searching via `/` or `?` now doesn't handle any characters in a special way.
 - Fixed crash when trying to retry some failed downloads on QtWebEngine.
+- An invalid spellcheck dictionary filename now doesn't crash anymore.
 
 v1.2.1
 ------

From adf2f9860de1879db4b45c4f9d9307d675702052 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 17:58:56 +0200
Subject: [PATCH 49/73] Disable spellcheck when it's unneeded.

Fixes #3753
---
 doc/changelog.asciidoc                             | 3 +++
 qutebrowser/browser/webengine/webenginesettings.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index d1536471d..3002fcd45 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -92,6 +92,9 @@ Fixed
 - Searching via `/` or `?` now doesn't handle any characters in a special way.
 - Fixed crash when trying to retry some failed downloads on QtWebEngine.
 - An invalid spellcheck dictionary filename now doesn't crash anymore.
+- When no spellcheck dictionaries are configured, it's now disabled internally.
+  This works around an issue with entering special characters on Facebook
+  messenger.
 
 v1.2.1
 ------
diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py
index 417465929..e3efc780c 100644
--- a/qutebrowser/browser/webengine/webenginesettings.py
+++ b/qutebrowser/browser/webengine/webenginesettings.py
@@ -179,7 +179,6 @@ class ProfileSetter:
         self._profile.settings().setAttribute(
             QWebEngineSettings.FullScreenSupportEnabled, True)
         if qtutils.version_check('5.8'):
-            self._profile.setSpellCheckEnabled(True)
             self.set_dictionary_language()
 
     def set_http_headers(self):
@@ -230,6 +229,7 @@ class ProfileSetter:
 
         log.config.debug("Found dicts: {}".format(filenames))
         self._profile.setSpellCheckLanguages(filenames)
+        self._profile.setSpellCheckEnabled(bool(filenames))
 
 
 def _update_settings(option):

From 388c155ebbb7e6690923323048a4b46a435947b9 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 18:02:20 +0200
Subject: [PATCH 50/73] Add test for #3753

---
 .../unit/browser/webengine/test_webenginesettings.py  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py
index e396e168b..d40002a77 100644
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -73,3 +73,14 @@ def test_existing_dict(config_stub, monkeypatch):
                     webenginesettings.private_profile]:
         assert profile.isSpellCheckEnabled()
         assert profile.spellCheckLanguages() == ['en-US-8-0']
+
+
+@pytest.mark.skipif(
+    not qtutils.version_check('5.8'), reason="Needs Qt 5.8 or newer")
+def test_spell_check_disabled(config_stub, monkeypatch):
+    monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebEngine)
+    config_stub.val.spellcheck.languages = []
+    webenginesettings._update_settings('spellcheck.languages')
+    for profile in [webenginesettings.default_profile,
+                    webenginesettings.private_profile]:
+        assert not profile.isSpellCheckEnabled()

From 2ba40acf74ee4e411437ba8022f5d1aae58c0e27 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 18:18:06 +0200
Subject: [PATCH 51/73] Update changelog for v1.3.0

---
 doc/changelog.asciidoc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 3002fcd45..1f1898487 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,8 +15,8 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
-v1.3.0 (unreleased)
--------------------
+v1.3.0
+------
 
 Added
 ~~~~~
@@ -25,8 +25,9 @@ Added
 - New `url.open_base_url` option to open the base URL of a searchengine when no
   search term is given.
 - New `tabs.min_width` setting to configure the minimal width for tabs.
-- New `getbib` userscript to download bibtex information for DOIs on a page.
-- New `qute-keepass` userscript to get passwords from KeePassX.
+- New userscripts:
+  * `getbib` to download bibtex information for DOIs on a page.
+  * `qute-keepass` to get passwords from KeePassX.
 
 Changed
 ~~~~~~~
@@ -53,7 +54,6 @@ Changed
 - Error messages when trying to wrap when `tabs.wrap` is `False` are now logged
   to debug instead of messages.
 
-
 Fixed
 ~~~~~
 
@@ -85,8 +85,6 @@ Fixed
 - Initial support for Qt 5.11.
 - Checking for a new version after sending a crash report now works properly
   again.
-- The `qute-pass` userscript now handles special chars in usernames/passwords
-  properly.
 - `@match` in Greasemonkey scripts now more closely matches the proper pattern
   syntax.
 - Searching via `/` or `?` now doesn't handle any characters in a special way.
@@ -95,6 +93,7 @@ Fixed
 - When no spellcheck dictionaries are configured, it's now disabled internally.
   This works around an issue with entering special characters on Facebook
   messenger.
+- The macOS release now should work again on macOS 10.11 and newer.
 
 v1.2.1
 ------

From 7762017f001889650dd6302aa737388ebaefb5e5 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 3 May 2018 18:19:21 +0200
Subject: [PATCH 52/73] Release v1.3.0

---
 qutebrowser/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py
index 31fd5983f..4255c5e58 100644
--- a/qutebrowser/__init__.py
+++ b/qutebrowser/__init__.py
@@ -26,7 +26,7 @@ __copyright__ = "Copyright 2014-2018 Florian Bruhin (The Compiler)"
 __license__ = "GPL"
 __maintainer__ = __author__
 __email__ = "mail@qutebrowser.org"
-__version_info__ = (1, 2, 1)
+__version_info__ = (1, 3, 0)
 __version__ = '.'.join(str(e) for e in __version_info__)
 __description__ = "A keyboard-driven, vim-like browser based on PyQt5."
 

From b9fc068af58098ac7f967c712850e468bf3b5386 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 7 May 2018 10:23:56 +0200
Subject: [PATCH 53/73] Add a log-requests debug-flag

---
 doc/changelog.asciidoc                        |  9 +++++++++
 qutebrowser/browser/webengine/interceptor.py  | 20 ++++++++++++++++---
 qutebrowser/browser/webengine/webenginetab.py |  3 ++-
 .../browser/webkit/network/networkmanager.py  | 12 ++++++++++-
 qutebrowser/qutebrowser.py                    |  5 ++++-
 .../webkit/network/test_networkmanager.py     |  2 +-
 tests/unit/browser/webkit/test_downloads.py   |  3 ++-
 7 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 1f1898487..8a49891a1 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,6 +15,15 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
+v1.4.0 (unreleased)
+-------------------
+
+Added
+~~~~~
+
+- New `--debug-flag log-requests` to log requests to the debug log for
+  debugging.
+
 v1.3.0
 ------
 
diff --git a/qutebrowser/browser/webengine/interceptor.py b/qutebrowser/browser/webengine/interceptor.py
index 480e8ee85..b04b7962e 100644
--- a/qutebrowser/browser/webengine/interceptor.py
+++ b/qutebrowser/browser/webengine/interceptor.py
@@ -19,20 +19,22 @@
 
 """A request interceptor taking care of adblocking and custom headers."""
 
-from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInterceptor
+from PyQt5.QtWebEngineCore import (QWebEngineUrlRequestInterceptor,
+                                   QWebEngineUrlRequestInfo)
 
 from qutebrowser.config import config
 from qutebrowser.browser import shared
-from qutebrowser.utils import utils, log
+from qutebrowser.utils import utils, log, debug
 
 
 class RequestInterceptor(QWebEngineUrlRequestInterceptor):
 
     """Handle ad blocking and custom headers."""
 
-    def __init__(self, host_blocker, parent=None):
+    def __init__(self, host_blocker, args, parent=None):
         super().__init__(parent)
         self._host_blocker = host_blocker
+        self._args = args
 
     def install(self, profile):
         """Install the interceptor on the given QWebEngineProfile."""
@@ -54,6 +56,18 @@ class RequestInterceptor(QWebEngineUrlRequestInterceptor):
         Args:
             info: QWebEngineUrlRequestInfo &info
         """
+        if 'log-requests' in self._args.debug_flags:
+            resource_type = debug.qenum_key(QWebEngineUrlRequestInfo,
+                                            info.resourceType())
+            navigation_type = debug.qenum_key(QWebEngineUrlRequestInfo,
+                                              info.navigationType())
+            log.webview.debug("{} {}, first-party {}, resource {}, "
+                              "navigation {}".format(
+                                  bytes(info.requestMethod()).decode('ascii'),
+                                  info.requestUrl().toDisplayString(),
+                                  info.firstPartyUrl().toDisplayString(),
+                                  resource_type, navigation_type))
+
         # FIXME:qtwebengine only block ads for NavigationTypeOther?
         if self._host_blocker.is_blocked(info.requestUrl()):
             log.webview.info("Request to {} blocked by host blocker.".format(
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 623ccc196..f320ff3a6 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -62,8 +62,9 @@ def init():
 
     log.init.debug("Initializing request interceptor...")
     host_blocker = objreg.get('host-blocker')
+    args = objreg.get('args')
     req_interceptor = interceptor.RequestInterceptor(
-        host_blocker, parent=app)
+        host_blocker, args=args, parent=app)
     req_interceptor.install(webenginesettings.default_profile)
     req_interceptor.install(webenginesettings.private_profile)
 
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 53508aaa6..a66802375 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -28,7 +28,8 @@ from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QCoreApplication, QUrl,
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkReply, QSslSocket
 
 from qutebrowser.config import config
-from qutebrowser.utils import message, log, usertypes, utils, objreg, urlutils
+from qutebrowser.utils import (message, log, usertypes, utils, objreg,
+                               urlutils, debug)
 from qutebrowser.browser import shared
 from qutebrowser.browser.webkit import certificateerror
 from qutebrowser.browser.webkit.network import (webkitqutescheme, networkreply,
@@ -147,6 +148,7 @@ class NetworkManager(QNetworkAccessManager):
             super().__init__(parent)
         log.init.debug("NetworkManager init done")
         self.adopted_downloads = 0
+        self._args = objreg.get('args')
         self._win_id = win_id
         self._tab_id = tab_id
         self._private = private
@@ -406,5 +408,13 @@ class NetworkManager(QNetworkAccessManager):
                 # the webpage shutdown here.
                 current_url = QUrl()
 
+        if 'log-requests' in self._args.debug_flags:
+            operation = debug.qenum_key(QNetworkAccessManager, op)
+            operation = operation.replace('Operation', '').upper()
+            log.webview.debug("{} {}, first-party {}".format(
+                operation,
+                req.url().toDisplayString(),
+                current_url.toDisplayString()))
+
         self.set_referer(req, current_url)
         return super().createRequest(op, req, outgoing_data)
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index 815ffd5a7..e532c24d0 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -159,9 +159,12 @@ def debug_flag_error(flag):
     Available flags:
         debug-exit: Turn on debugging of late exit.
         pdb-postmortem: Drop into pdb on exceptions.
+        no-sql-history: Don't store history items.
+        no-scroll-filtering: Process all scrolling updates.
+        log-requests: Log all network requests.
     """
     valid_flags = ['debug-exit', 'pdb-postmortem', 'no-sql-history',
-                   'no-scroll-filtering']
+                   'no-scroll-filtering', 'log-requests']
 
     if flag in valid_flags:
         return flag
diff --git a/tests/unit/browser/webkit/network/test_networkmanager.py b/tests/unit/browser/webkit/network/test_networkmanager.py
index cfc268406..f6701b419 100644
--- a/tests/unit/browser/webkit/network/test_networkmanager.py
+++ b/tests/unit/browser/webkit/network/test_networkmanager.py
@@ -26,7 +26,7 @@ from qutebrowser.browser.webkit import cookies
 pytestmark = pytest.mark.usefixtures('cookiejar_and_cache')
 
 
-def test_init_with_private_mode():
+def test_init_with_private_mode(fake_args):
     nam = networkmanager.NetworkManager(win_id=0, tab_id=0, private=True)
     assert isinstance(nam.cookieJar(), cookies.RAMCookieJar)
     assert nam.cache() is None
diff --git a/tests/unit/browser/webkit/test_downloads.py b/tests/unit/browser/webkit/test_downloads.py
index 87fff7244..571e21704 100644
--- a/tests/unit/browser/webkit/test_downloads.py
+++ b/tests/unit/browser/webkit/test_downloads.py
@@ -22,7 +22,8 @@ import pytest
 from qutebrowser.browser import downloads, qtnetworkdownloads
 
 
-def test_download_model(qapp, qtmodeltester, config_stub, cookiejar_and_cache):
+def test_download_model(qapp, qtmodeltester, config_stub, cookiejar_and_cache,
+                        fake_args):
     """Simple check for download model internals."""
     manager = qtnetworkdownloads.DownloadManager()
     model = downloads.DownloadModel(manager)

From 470c392ee09a670d0ea967c21c5731b7a9482d9d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 7 May 2018 18:39:13 +0200
Subject: [PATCH 54/73] Update attrs from 17.4.0 to 18.1.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 0a13c054c..4505f6080 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.4.0
+attrs==18.1.0
 flake8==3.5.0
 flake8-bugbear==18.2.0
 flake8-builtins==1.3.1

From 9e33f1a275e8529a2620bfe9072a1c3caf27cf68 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 7 May 2018 18:39:15 +0200
Subject: [PATCH 55/73] Update attrs from 17.4.0 to 18.1.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 4fc2cd6a3..dc548d44b 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.4.0
+attrs==18.1.0
 beautifulsoup4==4.6.0
 cheroot==6.2.4
 click==6.7

From a4424f28635e9597c5fa8e8d0dd9f87277791acf Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 7 May 2018 18:39:17 +0200
Subject: [PATCH 56/73] Update attrs from 17.4.0 to 18.1.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0d2652698..2695ba55f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-attrs==17.4.0
+attrs==18.1.0
 colorama==0.3.9
 cssutils==1.0.2
 Jinja2==2.10

From d4e5a2eb7fb21013a74cad321643f7ac68c361bd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 7 May 2018 18:39:18 +0200
Subject: [PATCH 57/73] Update flake8-builtins from 1.3.1 to 1.4.0

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 4505f6080..d793e8203 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -3,7 +3,7 @@
 attrs==18.1.0
 flake8==3.5.0
 flake8-bugbear==18.2.0
-flake8-builtins==1.3.1
+flake8-builtins==1.4.0
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0
 flake8-debugger==3.1.0

From e455d8c13a56e520d5b77fa42e5faba65888d3fa Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 7 May 2018 18:39:19 +0200
Subject: [PATCH 58/73] Update pep8-naming from 0.5.0 to 0.6.1

---
 misc/requirements/requirements-flake8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index d793e8203..712635fbb 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -18,7 +18,7 @@ flake8-tidy-imports==1.1.0
 flake8-tuple==0.2.13
 mccabe==0.6.1
 pathmatch==0.2.1
-pep8-naming==0.5.0
+pep8-naming==0.6.1
 pycodestyle==2.3.1  # rq.filter: < 2.4.0
 pydocstyle==2.1.1
 pyflakes==1.6.0

From fcd98443f96b2abd87a1c8bdc33944963019d0e3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 7 May 2018 18:39:21 +0200
Subject: [PATCH 59/73] Update flask from 1.0.1 to 1.0.2

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index dc548d44b..c09537f59 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -8,7 +8,7 @@ click==6.7
 coverage==4.5.1
 EasyProcess==0.2.3
 fields==5.0.0
-Flask==1.0.1
+Flask==1.0.2
 glob2==0.6
 hunter==2.0.2
 hypothesis==3.56.5

From b109fc569fcca9e642e71d8e9be46db0398fb573 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 7 May 2018 18:39:22 +0200
Subject: [PATCH 60/73] Update pytest-mock from 1.9.0 to 1.10.0

---
 misc/requirements/requirements-tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index c09537f59..2d3fb1020 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -28,7 +28,7 @@ pytest-benchmark==3.1.1
 pytest-cov==2.5.1
 pytest-faulthandler==1.5.0
 pytest-instafail==0.3.0
-pytest-mock==1.9.0
+pytest-mock==1.10.0
 pytest-qt==2.3.1
 pytest-repeat==0.4.1
 pytest-rerunfailures==4.0

From 431a52da6c72d1a106f7cb6f92c74a0b816f3094 Mon Sep 17 00:00:00 2001
From: Pol Van Aubel <github@polvanaubel.com>
Date: Mon, 7 May 2018 21:52:38 +0200
Subject: [PATCH 61/73] Short options for --basedir and --temp-basedir

---
 doc/qutebrowser.1.asciidoc | 4 ++--
 qutebrowser/qutebrowser.py | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc
index 4f89ae2ff..ff760dd08 100644
--- a/doc/qutebrowser.1.asciidoc
+++ b/doc/qutebrowser.1.asciidoc
@@ -38,7 +38,7 @@ show it.
 *-h*, *--help*::
     show this help message and exit
 
-*--basedir* 'BASEDIR'::
+*-B*, *--basedir* 'BASEDIR'::
     Base directory for all storage.
 
 *-V*, *--version*::
@@ -87,7 +87,7 @@ show it.
 *--nowindow*::
     Don't show the main window.
 
-*--temp-basedir*::
+*-T*, *--temp-basedir*::
     Use a temporary basedir.
 
 *--no-err-windows*::
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index e532c24d0..5b5b86eae 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -61,7 +61,8 @@ def get_argparser():
     """Get the argparse parser."""
     parser = argparse.ArgumentParser(prog='qutebrowser',
                                      description=qutebrowser.__description__)
-    parser.add_argument('--basedir', help="Base directory for all storage.")
+    parser.add_argument('-B', '--basedir', help="Base directory for all "
+                        "storage.")
     parser.add_argument('-V', '--version', help="Show version and quit.",
                         action='store_true')
     parser.add_argument('-s', '--set', help="Set a temporary setting for "
@@ -112,8 +113,8 @@ def get_argparser():
                        action='store_true')
     debug.add_argument('--nowindow', action='store_true', help="Don't show "
                        "the main window.")
-    debug.add_argument('--temp-basedir', action='store_true', help="Use a "
-                       "temporary basedir.")
+    debug.add_argument('-T', '--temp-basedir', action='store_true', help="Use "
+                       "a temporary basedir.")
     debug.add_argument('--no-err-windows', action='store_true', help="Don't "
                        "show any error windows (used for tests/smoke.py).")
     debug.add_argument('--qt-arg', help="Pass an argument with a value to Qt. "

From f1b481dcc72cc36026dc1863c01416026f1423b1 Mon Sep 17 00:00:00 2001
From: Pol Van Aubel <dev@polvanaubel.com>
Date: Mon, 7 May 2018 22:35:32 +0200
Subject: [PATCH 62/73] Short options for --debug and --debug-flags

---
 doc/qutebrowser.1.asciidoc | 4 ++--
 qutebrowser/qutebrowser.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc
index ff760dd08..528aac2c9 100644
--- a/doc/qutebrowser.1.asciidoc
+++ b/doc/qutebrowser.1.asciidoc
@@ -72,7 +72,7 @@ show it.
 *--loglines* 'LOGLINES'::
     How many lines of the debug log to keep in RAM (-1: unlimited).
 
-*--debug*::
+*-d*, *--debug*::
     Turn on debugging options.
 
 *--json-logging*::
@@ -99,7 +99,7 @@ show it.
 *--qt-flag* 'QT_FLAG'::
     Pass an argument to Qt as flag.
 
-*--debug-flag* 'DEBUG_FLAGS'::
+*-D*, *--debug-flag* 'DEBUG_FLAGS'::
     Pass name of debugging feature to be turned on.
 // QUTE_OPTIONS_END
 
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index 5b5b86eae..292c80c6a 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -103,7 +103,7 @@ def get_argparser():
                        help="How many lines of the debug log to keep in RAM "
                        "(-1: unlimited).",
                        default=2000, type=int)
-    debug.add_argument('--debug', help="Turn on debugging options.",
+    debug.add_argument('-d', '--debug', help="Turn on debugging options.",
                        action='store_true')
     debug.add_argument('--json-logging', action='store_true', help="Output log"
                        " lines in JSON format (one object per line).")
@@ -124,9 +124,9 @@ def get_argparser():
                        action='append')
     debug.add_argument('--qt-flag', help="Pass an argument to Qt as flag.",
                        nargs=1, action='append')
-    debug.add_argument('--debug-flag', type=debug_flag_error, default=[],
-                       help="Pass name of debugging feature to be turned on.",
-                       action='append', dest='debug_flags')
+    debug.add_argument('-D', '--debug-flag', type=debug_flag_error,
+                       default=[], help="Pass name of debugging feature to be"
+                       " turned on.", action='append', dest='debug_flags')
     parser.add_argument('command', nargs='*', help="Commands to execute on "
                         "startup.", metavar=':command')
     # URLs will actually be in command

From d0b2360745c760efbbe085a3c4bc28fe193860bd Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 7 May 2018 13:35:41 -0700
Subject: [PATCH 63/73] Clear visited links db when running :history-clear on
 webengine

---
 qutebrowser/browser/history.py                | 5 ++++-
 qutebrowser/browser/webengine/webenginetab.py | 7 +++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index 85922f9e8..f860813db 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -23,7 +23,7 @@ import os
 import time
 import contextlib
 
-from PyQt5.QtCore import pyqtSlot, QUrl, QTimer
+from PyQt5.QtCore import pyqtSlot, QUrl, QTimer, pyqtSignal
 
 from qutebrowser.commands import cmdutils, cmdexc
 from qutebrowser.utils import (utils, objreg, log, usertypes, message,
@@ -52,6 +52,8 @@ class WebHistory(sql.SqlTable):
 
     """The global history of visited pages."""
 
+    history_cleared = pyqtSignal()
+
     def __init__(self, parent=None):
         super().__init__("History", ['url', 'title', 'atime', 'redirect'],
                          constraints={'url': 'NOT NULL',
@@ -157,6 +159,7 @@ class WebHistory(sql.SqlTable):
         with self._handle_sql_errors():
             self.delete_all()
             self.completion.delete_all()
+        self.history_cleared.emit()
 
     def delete_url(self, url):
         """Remove all history entries with the given url.
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 145bc9c44..e1716027a 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -73,6 +73,13 @@ def init():
     download_manager.install(webenginesettings.private_profile)
     objreg.register('webengine-download-manager', download_manager)
 
+    # Clear visited links on web history clear
+    hist = objreg.get('web-history')
+    hist.history_cleared.connect(
+        webenginesettings.default_profile.clearAllVisitedLinks)
+    hist.history_cleared.connect(
+        webenginesettings.private_profile.clearAllVisitedLinks)
+
 
 # Mapping worlds from usertypes.JsWorld to QWebEngineScript world IDs.
 _JS_WORLD_MAP = {

From ca48f9f1004076ad03ed974842f915820b90a13b Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 7 May 2018 13:48:06 -0700
Subject: [PATCH 64/73] Clear url from visitedLinks if a single url is deleted

---
 qutebrowser/browser/history.py                | 4 ++++
 qutebrowser/browser/webengine/webenginetab.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index f860813db..7c0db112a 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -52,7 +52,10 @@ class WebHistory(sql.SqlTable):
 
     """The global history of visited pages."""
 
+    # All web history cleared
     history_cleared = pyqtSignal()
+    # one url cleared
+    url_cleared = pyqtSignal(QUrl)
 
     def __init__(self, parent=None):
         super().__init__("History", ['url', 'title', 'atime', 'redirect'],
@@ -171,6 +174,7 @@ class WebHistory(sql.SqlTable):
         qtutils.ensure_valid(qurl)
         self.delete('url', self._format_url(qurl))
         self.completion.delete('url', self._format_completion_url(qurl))
+        self.url_cleared.emit(qurl)
 
     @pyqtSlot(QUrl, QUrl, str)
     def add_from_tab(self, url, requested_url, title):
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index e1716027a..cb3feffdb 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -79,6 +79,10 @@ def init():
         webenginesettings.default_profile.clearAllVisitedLinks)
     hist.history_cleared.connect(
         webenginesettings.private_profile.clearAllVisitedLinks)
+    hist.url_cleared.connect(
+        lambda url: webenginesettings.default_profile.clearVisitedLinks([url]))
+    hist.url_cleared.connect(
+        lambda url: webenginesettings.private_profile.clearVisitedLinks([url]))
 
 
 # Mapping worlds from usertypes.JsWorld to QWebEngineScript world IDs.

From 906da44d701cfc618f9ebf5d2b7d54e7becfd807 Mon Sep 17 00:00:00 2001
From: Jay Kamat <jaygkamat@gmail.com>
Date: Mon, 7 May 2018 14:10:03 -0700
Subject: [PATCH 65/73] Simplify visited link clearing by looping over
 connections

---
 qutebrowser/browser/webengine/webenginetab.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index cb3feffdb..57b265e4d 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -75,14 +75,11 @@ def init():
 
     # Clear visited links on web history clear
     hist = objreg.get('web-history')
-    hist.history_cleared.connect(
-        webenginesettings.default_profile.clearAllVisitedLinks)
-    hist.history_cleared.connect(
-        webenginesettings.private_profile.clearAllVisitedLinks)
-    hist.url_cleared.connect(
-        lambda url: webenginesettings.default_profile.clearVisitedLinks([url]))
-    hist.url_cleared.connect(
-        lambda url: webenginesettings.private_profile.clearVisitedLinks([url]))
+    for p in [webenginesettings.default_profile,
+              webenginesettings.private_profile]:
+        hist.history_cleared.connect(p.clearAllVisitedLinks)
+        hist.url_cleared.connect(lambda url, profile=p:
+                                 profile.clearVisitedLinks([url]))
 
 
 # Mapping worlds from usertypes.JsWorld to QWebEngineScript world IDs.

From d005088b6b341aa5d89e116587e07eaa9f0cbcfa Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 8 May 2018 11:26:45 +0200
Subject: [PATCH 66/73] Add missing fake_args fixture

---
 tests/helpers/fixtures.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 0e147b211..c4756e1f5 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -154,7 +154,7 @@ def greasemonkey_manager(data_tmpdir):
 
 @pytest.fixture
 def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager,
-               session_manager_stub, greasemonkey_manager):
+               session_manager_stub, greasemonkey_manager, fake_args):
     webkittab = pytest.importorskip('qutebrowser.browser.webkit.webkittab')
     tab = webkittab.WebKitTab(win_id=0, mode_manager=mode_manager,
                               private=False)

From 648b1219a25c4fb27bf305381e958ff8966a803a Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 8 May 2018 11:34:17 +0200
Subject: [PATCH 67/73] Filter flake8-builtins 1.4.0

See https://github.com/gforcada/flake8-builtins/issues/36
---
 misc/requirements/requirements-flake8.txt     | 2 +-
 misc/requirements/requirements-flake8.txt-raw | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/misc/requirements/requirements-flake8.txt b/misc/requirements/requirements-flake8.txt
index 712635fbb..a29b2293c 100644
--- a/misc/requirements/requirements-flake8.txt
+++ b/misc/requirements/requirements-flake8.txt
@@ -3,7 +3,7 @@
 attrs==18.1.0
 flake8==3.5.0
 flake8-bugbear==18.2.0
-flake8-builtins==1.4.0
+flake8-builtins==1.3.1  # rq.filter: != 1.4.0
 flake8-comprehensions==1.4.1
 flake8-copyright==0.2.0
 flake8-debugger==3.1.0
diff --git a/misc/requirements/requirements-flake8.txt-raw b/misc/requirements/requirements-flake8.txt-raw
index cd1ca421f..7ccbbce26 100644
--- a/misc/requirements/requirements-flake8.txt-raw
+++ b/misc/requirements/requirements-flake8.txt-raw
@@ -1,6 +1,6 @@
 flake8
 flake8-bugbear
-flake8-builtins
+flake8-builtins!=1.4.0
 flake8-comprehensions
 flake8-copyright
 flake8-debugger
@@ -18,3 +18,6 @@ pyflakes
 
 # https://github.com/PyCQA/pycodestyle/issues/741
 #@ filter: pycodestyle < 2.4.0
+
+# https://github.com/gforcada/flake8-builtins/issues/36
+#@ filter: flake8-builtins != 1.4.0

From b28bfbe8f5a0b4d1b1bc9b51545412a036a2b8e0 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 8 May 2018 11:38:45 +0200
Subject: [PATCH 68/73] Update docs

---
 doc/changelog.asciidoc     | 5 +++++
 doc/qutebrowser.1.asciidoc | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 8a49891a1..365d455b3 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -24,6 +24,11 @@ Added
 - New `--debug-flag log-requests` to log requests to the debug log for
   debugging.
 
+Changed
+~~~~~~~
+
+- New short flags for commandline arguments: `-B` and `-T` for `--basedir` and `--temp-basedir`; `-d` and `-D` for `--debug` and `--debug-flag`.
+
 v1.3.0
 ------
 
diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc
index 528aac2c9..1d264dc10 100644
--- a/doc/qutebrowser.1.asciidoc
+++ b/doc/qutebrowser.1.asciidoc
@@ -38,7 +38,7 @@ show it.
 *-h*, *--help*::
     show this help message and exit
 
-*-B*, *--basedir* 'BASEDIR'::
+*-B* 'BASEDIR', *--basedir* 'BASEDIR'::
     Base directory for all storage.
 
 *-V*, *--version*::
@@ -99,7 +99,7 @@ show it.
 *--qt-flag* 'QT_FLAG'::
     Pass an argument to Qt as flag.
 
-*-D*, *--debug-flag* 'DEBUG_FLAGS'::
+*-D* 'DEBUG_FLAGS', *--debug-flag* 'DEBUG_FLAGS'::
     Pass name of debugging feature to be turned on.
 // QUTE_OPTIONS_END
 

From a39858c4360a484f21da3c58022fe777a1477761 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 8 May 2018 11:41:14 +0200
Subject: [PATCH 69/73] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 365d455b3..77a76dce4 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -28,6 +28,7 @@ Changed
 ~~~~~~~
 
 - New short flags for commandline arguments: `-B` and `-T` for `--basedir` and `--temp-basedir`; `-d` and `-D` for `--debug` and `--debug-flag`.
+- Deleting history items via `:history-clear` or `:completion-item-del` now also removes that URL from QtWebEngine's visited links.
 
 v1.3.0
 ------

From 4fee9b9637e81ea8cdb8c5a431966346159063a2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 8 May 2018 11:44:06 +0200
Subject: [PATCH 70/73] Update changelog

---
 doc/changelog.asciidoc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 77a76dce4..6ac7126ab 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -29,6 +29,7 @@ Changed
 
 - New short flags for commandline arguments: `-B` and `-T` for `--basedir` and `--temp-basedir`; `-d` and `-D` for `--debug` and `--debug-flag`.
 - Deleting history items via `:history-clear` or `:completion-item-del` now also removes that URL from QtWebEngine's visited links.
+- There's now completion for commands taking a variable count of arguments (like `:config-cycle`).
 
 v1.3.0
 ------

From c8d539a4c6a879e2ac2d644ae5accc171da8959e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 8 May 2018 11:45:58 +0200
Subject: [PATCH 71/73] Update changelog

---
 doc/changelog.asciidoc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 6ac7126ab..3c6c796c7 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -23,13 +23,18 @@ Added
 
 - New `--debug-flag log-requests` to log requests to the debug log for
   debugging.
+- New `--first` flag for `:hint` (bound to `gi` for inputs) which automatically
+  selects the first hint.
 
 Changed
 ~~~~~~~
 
-- New short flags for commandline arguments: `-B` and `-T` for `--basedir` and `--temp-basedir`; `-d` and `-D` for `--debug` and `--debug-flag`.
-- Deleting history items via `:history-clear` or `:completion-item-del` now also removes that URL from QtWebEngine's visited links.
-- There's now completion for commands taking a variable count of arguments (like `:config-cycle`).
+- New short flags for commandline arguments: `-B` and `-T` for `--basedir` and
+  `--temp-basedir`; `-d` and `-D` for `--debug` and `--debug-flag`.
+- Deleting history items via `:history-clear` or `:completion-item-del` now
+  also removes that URL from QtWebEngine's visited links.
+- There's now completion for commands taking a variable count of arguments
+  (like `:config-cycle`).
 
 v1.3.0
 ------

From 20efaeff197f1cb0d8b5957e0cf61cb1759f321b Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 8 May 2018 14:57:56 +0200
Subject: [PATCH 72/73] Improve configuration docs

---
 doc/help/configuring.asciidoc | 87 ++++++++++++++++++++++-------------
 1 file changed, 54 insertions(+), 33 deletions(-)

diff --git a/doc/help/configuring.asciidoc b/doc/help/configuring.asciidoc
index 3c686d15a..714996db2 100644
--- a/doc/help/configuring.asciidoc
+++ b/doc/help/configuring.asciidoc
@@ -3,44 +3,28 @@ Configuring qutebrowser
 
 IMPORTANT: qutebrowser's configuration system was completely rewritten in
 September 2017. This information is not applicable to older releases, and older
-information elsewhere might be outdated. **If you had an old configuration
-around and upgraded, this page will automatically open once**. To view it at a
-later time, use the `:help` command.
+information elsewhere might be outdated.
 
-Migrating older configurations
-------------------------------
+qutebrowser's config files
+--------------------------
 
-qutebrowser does no automatic migration for the new configuration. However,
-there's a special link:qute://configdiff/old[configdiff] page
-(`qute://configdiff/old`) in qutebrowser, which will show you the changes you
-did in your old configuration, compared to the old defaults.
+qutebrowser releases before v1.0.0 had a `qutebrowser.conf` and `keys.conf`
+file. Those are not used anymore since that release - see
+<<migrating,"Migrating older configurations">> for information on how to
+migrate to the new config.
 
-Other changes in default settings:
+When using `:set` and `:bind`, changes are saved to an `autoconfig.yml` file
+automatically. If you don't want to have a config file which is curated by
+hand, you can simply use those - see
+<<autoconfig,"Configuring qutebrowser via the user interface">> for details.
 
-- In v1.1.x and newer, `<Up>` and `<Down>` navigate through command history
-  if no text was entered yet.
-  With v1.0.x, they always navigate through command history instead of selecting
-  completion items. Use `<Tab>`/`<Shift-Tab>` to cycle through the completion
-  instead.
-  You can get back the old behavior by doing:
-+
-----
-:bind -m command <Up> completion-item-focus prev
-:bind -m command <Down> completion-item-focus next
-----
-+
-or always navigate through command history with
-+
-----
-:bind -m command <Up> command-history-prev
-:bind -m command <Down> command-history-next
-----
-
-- The default for `completion.web_history_max_items` is now set to `-1`, showing
-  an unlimited number of items in the completion for `:open` as the new
-  sqlite-based completion is much faster. If the `:open` completion is too slow
-  on your machine, set an appropriate limit again.
+For more advanced configuration, you can write a `config.py` file - see
+<<configpy,"Configuring qutebrowser via config.py">>. As soon as a `config.py`
+exists, the `autoconfig.yml` file **is not read anymore** by default. You need
+to <<configpy-autoconfig,load it by hand>> if you want settings done via
+`:set`/`:bind` to still persist.
 
+[[autoconfig]]
 Configuring qutebrowser via the user interface
 ----------------------------------------------
 
@@ -88,6 +72,7 @@ link:commands.html#config-clear[`:config-clear`] to reset the entire configurati
 and link:commands.html#config-cycle[`:config-cycle`] to cycle a setting between
 different values.
 
+[[configpy]]
 Configuring qutebrowser via config.py
 -------------------------------------
 
@@ -239,6 +224,7 @@ config.bind(',v', 'spawn mpv {url}')
 To suppress loading of any default keybindings, you can set
 `c.bindings.default = {}`.
 
+[[configpy-autoconfig]]
 Loading `autoconfig.yml`
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -429,3 +415,38 @@ from qutebrowser.config.config import ConfigContainer  # noqa: F401
 config = config  # type: ConfigAPI # noqa: F821 pylint: disable=E0602,C0103
 c = c  # type: ConfigContainer # noqa: F821 pylint: disable=E0602,C0103
 ----
+
+[[migrating]]
+Migrating older configurations
+------------------------------
+
+qutebrowser does no automatic migration for the new configuration. However,
+there's a special link:qute://configdiff/old[configdiff] page
+(`qute://configdiff/old`) in qutebrowser, which will show you the changes you
+did in your old configuration, compared to the old defaults.
+
+Other changes in default settings:
+
+- In v1.1.x and newer, `<Up>` and `<Down>` navigate through command history
+  if no text was entered yet.
+  With v1.0.x, they always navigate through command history instead of selecting
+  completion items. Use `<Tab>`/`<Shift-Tab>` to cycle through the completion
+  instead.
+  You can get back the old behavior by doing:
++
+----
+:bind -m command <Up> completion-item-focus prev
+:bind -m command <Down> completion-item-focus next
+----
++
+or always navigate through command history with
++
+----
+:bind -m command <Up> command-history-prev
+:bind -m command <Down> command-history-next
+----
+
+- The default for `completion.web_history_max_items` is now set to `-1`, showing
+  an unlimited number of items in the completion for `:open` as the new
+  sqlite-based completion is much faster. If the `:open` completion is too slow
+  on your machine, set an appropriate limit again.

From 48c44e1b4d8caea7df7b6d0c1107694fa349e2b4 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 8 May 2018 15:22:49 +0200
Subject: [PATCH 73/73] Fix and update docs

---
 doc/help/commands.asciidoc   | 3 ++-
 doc/help/settings.asciidoc   | 1 +
 qutebrowser/browser/hints.py | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 31ed75486..e8dbf91c4 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -530,7 +530,7 @@ Show help about a command or setting.
 
 [[hint]]
 === hint
-Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*]
+Syntax: +:hint [*--mode* 'mode'] [*--add-history*] [*--rapid*] [*--first*]
      ['group'] ['target'] ['args' ['args' ...]]+
 
 Start hinting.
@@ -600,6 +600,7 @@ Start hinting.
  `tab` (with `tabs.background_tabs=true`), `tab-bg`,
  `window`, `run`, `hover`, `userscript` and `spawn`.
 
+* +*-f*+, +*--first*+: Click the first hinted element without prompting.
 
 ==== note
 * This command does not split arguments after the last argument and handles quotes literally.
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 1e58ffa87..a7ebede3d 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -562,6 +562,7 @@ Default:
 * +pass:[gd]+: +pass:[download]+
 * +pass:[gf]+: +pass:[view-source]+
 * +pass:[gg]+: +pass:[scroll-to-perc 0]+
+* +pass:[gi]+: +pass:[hint inputs --first]+
 * +pass:[gl]+: +pass:[tab-move -]+
 * +pass:[gm]+: +pass:[tab-move]+
 * +pass:[go]+: +pass:[set-cmd-text :open {url:pretty}]+
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 13078efe2..715a4a4db 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -636,8 +636,8 @@ class HintManager(QObject):
                    `window`, `run`, `hover`, `userscript` and `spawn`.
             add_history: Whether to add the spawned or yanked link to the
                          browsing history.
-            group: The element types to hint.
             first: Click the first hinted element without prompting.
+            group: The element types to hint.
 
                 - `all`: All clickable elements.
                 - `links`: Only links.