From ec3486516887a30f99c689da16f04fc2955d5881 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 23 Jul 2023 11:38:19 +0200 Subject: Move master branch references to main Closes #7097 --- .github/CONTRIBUTING.asciidoc | 2 +- .github/FUNDING.yml | 2 +- .github/workflows/docker.yml | 2 +- .github/workflows/nightly.yml | 12 ++++++------ README.asciidoc | 8 ++++---- doc/changelog.asciidoc | 4 ++-- doc/contributing.asciidoc | 10 +++++----- doc/faq.asciidoc | 2 +- doc/help/index.asciidoc | 2 +- doc/install.asciidoc | 2 +- doc/quickstart.asciidoc | 8 ++++---- misc/org.qutebrowser.qutebrowser.appdata.xml | 8 ++++---- misc/userscripts/qute-1pass | 2 +- misc/userscripts/qute-keepassxc | 2 +- qutebrowser/config/configfiles.py | 2 +- qutebrowser/misc/crashdialog.py | 2 +- qutebrowser/misc/earlyinit.py | 2 +- scripts/asciidoc2html.py | 4 ++-- scripts/dev/check_doc_changes.py | 2 +- scripts/dev/update_version.py | 2 +- tests/end2end/data/downloads/mhtml/complex/complex.html | 2 +- tox.ini | 2 +- www/header.asciidoc | 2 +- 23 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/CONTRIBUTING.asciidoc b/.github/CONTRIBUTING.asciidoc index 0d03af336..9c119baa3 100644 --- a/.github/CONTRIBUTING.asciidoc +++ b/.github/CONTRIBUTING.asciidoc @@ -9,7 +9,7 @@ open pull requests. pull request page after pushing changes. - If you are stuck somewhere or have questions, - https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/index.asciidoc#getting-help[please ask]! + https://github.com/qutebrowser/qutebrowser/blob/main/doc/help/index.asciidoc#getting-help[please ask]! See the link:../doc/contributing.asciidoc[full contribution documentation] for details and other useful hints. diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 4faa45afb..65ab0afa3 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ github: The-Compiler -custom: https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating +custom: https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 68d2243a4..c8161b37d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -36,7 +36,7 @@ jobs: file: scripts/dev/ci/docker/Dockerfile context: . tags: "qutebrowser/ci:${{ matrix.image }}" - push: ${{ github.ref == 'refs/heads/master' }} + push: ${{ github.ref == 'refs/heads/main' }} irc: timeout-minutes: 2 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c1a8dda8a..2502d017b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -15,33 +15,33 @@ jobs: matrix: include: - os: macos-11 - branch: master + branch: main toxenv: build-release-qt5 name: qt5-macos - os: windows-2019 args: --64bit - branch: master + branch: main toxenv: build-release-qt5 name: qt5-windows-64bit - os: windows-2019 args: --32bit - branch: master + branch: main toxenv: build-release-qt5 name: qt5-windows-32bit - os: macos-11 args: --debug - branch: master + branch: main toxenv: build-release-qt5 name: qt5-macos-debug - os: windows-2019 args: --64bit --debug - branch: master + branch: main toxenv: build-release-qt5 name: qt5-windows-64bit-debug - os: windows-2019 args: --32bit --debug - branch: master + branch: main toxenv: build-release-qt5 name: qt5-windows-32bit-debug diff --git a/README.asciidoc b/README.asciidoc index b3fd3331f..351003467 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -1,7 +1,7 @@ // If you are reading this in plaintext or on PyPi: // // A rendered version is available at: -// https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc +// https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc qutebrowser =========== @@ -10,9 +10,9 @@ qutebrowser image:qutebrowser/icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on Python and Qt.* image:https://github.com/qutebrowser/qutebrowser/workflows/CI/badge.svg["Build Status", link="https://github.com/qutebrowser/qutebrowser/actions?query=workflow%3ACI"] -image:https://codecov.io/github/qutebrowser/qutebrowser/coverage.svg?branch=master["coverage badge",link="https://codecov.io/github/qutebrowser/qutebrowser?branch=master"] +image:https://codecov.io/github/qutebrowser/qutebrowser/coverage.svg?branch=main["coverage badge",link="https://codecov.io/github/qutebrowser/qutebrowser?branch=main"] -link:https://www.qutebrowser.org[website] | link:https://blog.qutebrowser.org[blog] | https://github.com/qutebrowser/qutebrowser/blob/master/doc/faq.asciidoc[FAQ] | https://www.qutebrowser.org/doc/contributing.html[contributing] | link:https://github.com/qutebrowser/qutebrowser/releases[releases] | https://github.com/qutebrowser/qutebrowser/blob/master/doc/install.asciidoc[installing] +link:https://www.qutebrowser.org[website] | link:https://blog.qutebrowser.org[blog] | https://github.com/qutebrowser/qutebrowser/blob/main/doc/faq.asciidoc[FAQ] | https://www.qutebrowser.org/doc/contributing.html[contributing] | link:https://github.com/qutebrowser/qutebrowser/releases[releases] | https://github.com/qutebrowser/qutebrowser/blob/main/doc/install.asciidoc[installing] // QUTE_WEB_HIDE_END qutebrowser is a keyboard-focused browser with a minimal GUI. It's based @@ -25,7 +25,7 @@ It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl. part-time on qutebrowser, funded by donations.** To sustain this for a long time, your help is needed! See the https://github.com/sponsors/The-Compiler/[GitHub Sponsors page] or -https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating[alternative donation methods] +https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating[alternative donation methods] for more information. Depending on your sign-up date and how long you keep a certain level, you can get qutebrowser t-shirts, stickers and more! diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc index b94e1d66d..9d9382437 100644 --- a/doc/changelog.asciidoc +++ b/doc/changelog.asciidoc @@ -1168,7 +1168,7 @@ Changed It also has compatibility issues with various websites (GitHub, Twitch, Android Developer documentation, YouTube, ...). Since no newer Debian Stable is released at the time of writing, it's recommended to - https://github.com/qutebrowser/qutebrowser/blob/master/doc/install.asciidoc#installing-qutebrowser-with-virtualenv[install qutebrowser in a virtualenv] + https://github.com/qutebrowser/qutebrowser/blob/main/doc/install.asciidoc#installing-qutebrowser-with-virtualenv[install qutebrowser in a virtualenv] with a newer version of Qt/PyQt. - New optional dependency on the Python `adblock` library (see above for details). - The (formerly optional) `cssutils` dependency is now removed. It was only @@ -3319,7 +3319,7 @@ Major changes completion is too slow on your machine, try setting it to a few 1000 items. - Up/Down now navigates through the command history instead of selecting completion items. Either use Tab to cycle through the completion, or - https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#migrating-older-configurations[restore the old behavior]. + https://github.com/qutebrowser/qutebrowser/blob/main/doc/help/configuring.asciidoc#migrating-older-configurations[restore the old behavior]. Added ~~~~~ diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc index 50773f544..aa0c7516a 100644 --- a/doc/contributing.asciidoc +++ b/doc/contributing.asciidoc @@ -84,9 +84,9 @@ If you prefer to send a patch to the mailinglist, you can generate a patch based on your changes like this: ---- -git format-patch origin/master <1> +git format-patch origin/main <1> ---- -<1> Replace `master` by the branch your work was based on, e.g., +<1> Replace `main` by the branch your work was based on, e.g., `origin/develop`. Running qutebrowser @@ -759,13 +759,13 @@ qutebrowser release * Make sure there are no unstaged changes and the tests are green. * Make sure all issues with the related milestone are closed. * Consider updating the completions for `content.headers.user_agent` in `configdata.yml`. -* Minor release: Consider updating some files from master: +* Minor release: Consider updating some files from main: - `misc/requirements/` and `requirements.txt` - `scripts/` * Make sure Python is up-to-date on build machines. * Mark the milestone at https://github.com/qutebrowser/qutebrowser/milestones as closed. -* Update changelog in master branch -* If necessary: Update changelog in release branch from master. +* Update changelog in main branch +* If necessary: Update changelog in release branch from main. * Run `./.venv/bin/python3 scripts/dev/update_version.py {major,minor,patch}`. * Run the printed instructions accordingly. * Update `qutebrowser-git` PKGBUILD if dependencies/install changed. diff --git a/doc/faq.asciidoc b/doc/faq.asciidoc index 61f787d3d..b5edb3646 100644 --- a/doc/faq.asciidoc +++ b/doc/faq.asciidoc @@ -255,7 +255,7 @@ Why does it take longer to open a URL in qutebrowser than in chromium?:: loaded until it is detected that there is an instance running to which the URL is then passed. This takes some time. One workaround is to use this - https://github.com/qutebrowser/qutebrowser/blob/master/scripts/open_url_in_instance.sh[script] + https://github.com/qutebrowser/qutebrowser/blob/main/scripts/open_url_in_instance.sh[script] and place it in your $PATH with the name "qutebrowser". This script passes the URL via a unix socket to qutebrowser (if its running already) using socat which is much faster and starts a new diff --git a/doc/help/index.asciidoc b/doc/help/index.asciidoc index 127cc5d86..c7308ff63 100644 --- a/doc/help/index.asciidoc +++ b/doc/help/index.asciidoc @@ -6,7 +6,7 @@ Documentation The following help pages are currently available: -* link:https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png[Key binding cheatsheet] +* link:https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-big.png[Key binding cheatsheet] * link:../quickstart{outfilesuffix}[Quick start guide] * link:../faq{outfilesuffix}[Frequently asked questions] * link:../changelog{outfilesuffix}[Change Log] diff --git a/doc/install.asciidoc b/doc/install.asciidoc index 63c6e95fc..12403b2c5 100644 --- a/doc/install.asciidoc +++ b/doc/install.asciidoc @@ -396,7 +396,7 @@ Packagers --------- qutebrowser ships with a -https://github.com/qutebrowser/qutebrowser/blob/master/misc/Makefile[Makefile] +https://github.com/qutebrowser/qutebrowser/blob/main/misc/Makefile[Makefile] intended for packagers. This installs system-wide files in a proper locations, so it should be preferred to the usual `setup.py install` or `pip install` invocation. diff --git a/doc/quickstart.asciidoc b/doc/quickstart.asciidoc index 1b513a371..733ef7ad4 100644 --- a/doc/quickstart.asciidoc +++ b/doc/quickstart.asciidoc @@ -23,9 +23,9 @@ Basic keybindings to get you started What to do now -------------- -* View the link:https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png[key binding cheatsheet] +* View the link:https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-big.png[key binding cheatsheet] to make yourself familiar with the key bindings: + -image:https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png"] +image:https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-small.png["qutebrowser key binding cheatsheet",link="https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-big.png"] * There's also a https://www.shortcutfoo.com/app/dojos/qutebrowser[free training course] on shortcutfoo for the keybindings - note that you need to be in insert mode (i) for it to work. @@ -63,11 +63,11 @@ qutebrowser, funded by donations. To sustain this for a long time, your help is needed! Check the https://github.com/sponsors/The-Compiler/[GitHub Sponsors page] or -https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating[alternative +https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating[alternative donation methods] for more information. Depending on your sign-up date and how long you keep a certain level, you can get qutebrowser t-shirts, stickers and more! Alternatively, there are also various options available for one-time donations, see the -https://github.com/qutebrowser/qutebrowser/blob/master/README.asciidoc#donating[donation section] +https://github.com/qutebrowser/qutebrowser/blob/main/README.asciidoc#donating[donation section] in the README for details. diff --git a/misc/org.qutebrowser.qutebrowser.appdata.xml b/misc/org.qutebrowser.qutebrowser.appdata.xml index e75709d0c..6762866a4 100644 --- a/misc/org.qutebrowser.qutebrowser.appdata.xml +++ b/misc/org.qutebrowser.qutebrowser.appdata.xml @@ -23,16 +23,16 @@ org.qutebrowser.qutebrowser.desktop - https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/main.png + https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/main.png - https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/downloads.png + https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/downloads.png - https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/completion.png + https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/completion.png - https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/hints.png + https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/hints.png https://www.qutebrowser.org diff --git a/misc/userscripts/qute-1pass b/misc/userscripts/qute-1pass index 091f841fc..19e5414a5 100755 --- a/misc/userscripts/qute-1pass +++ b/misc/userscripts/qute-1pass @@ -2,7 +2,7 @@ set +e -# JS field injection code from https://github.com/qutebrowser/qutebrowser/blob/master/misc/userscripts/password_fill +# JS field injection code from https://github.com/qutebrowser/qutebrowser/blob/main/misc/userscripts/password_fill javascript_escape() { # print the first argument in an escaped way, such that it can safely # be used within javascripts double quotes diff --git a/misc/userscripts/qute-keepassxc b/misc/userscripts/qute-keepassxc index 61a6c7bce..10a68fb2d 100755 --- a/misc/userscripts/qute-keepassxc +++ b/misc/userscripts/qute-keepassxc @@ -91,7 +91,7 @@ insert mode if you prefer that). [2]: https://qutebrowser.org/ [3]: https://gnupg.org/ [4]: https://github.com/keepassxreboot/keepassxc-browser/blob/develop/keepassxc-protocol.md -[5]: https://github.com/qutebrowser/qutebrowser/blob/master/doc/userscripts.asciidoc +[5]: https://github.com/qutebrowser/qutebrowser/blob/main/doc/userscripts.asciidoc [6]: https://keepassxc.org/docs/KeePassXC_GettingStarted.html#_setup_browser_integration """ diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index ac593cfae..e679ff09a 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -306,7 +306,7 @@ class YamlConfig(QObject): f.write(textwrap.dedent(""" # If a config.py file exists, this file is ignored unless it's explicitly loaded # via config.load_autoconfig(). For more information, see: - # https://github.com/qutebrowser/qutebrowser/blob/master/doc/help/configuring.asciidoc#loading-autoconfigyml + # https://github.com/qutebrowser/qutebrowser/blob/main/doc/help/configuring.asciidoc#loading-autoconfigyml # DO NOT edit this file by hand, qutebrowser will overwrite it. # Instead, create a config.py - see :help for details. diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py index 04c92a529..f42c3d6f6 100644 --- a/qutebrowser/misc/crashdialog.py +++ b/qutebrowser/misc/crashdialog.py @@ -510,7 +510,7 @@ class FatalCrashDialog(_CrashDialog): "
Note: Crash reports for fatal crashes sometimes don't " "contain the information necessary to fix an issue. Please " "follow the steps in " + "qutebrowser/blob/main/doc/stacktrace.asciidoc'>" "stacktrace.asciidoc to submit a stacktrace.
") self._lbl.setText(text) diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 57e821784..eeb89b485 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -62,7 +62,7 @@ def _missing_str(name, *, webengine=False): "The error encountered was:
%ERROR%"] lines = ['Please search for the python3 version of {} in your ' 'distributions packages, or see ' - 'https://github.com/qutebrowser/qutebrowser/blob/master/doc/install.asciidoc' + 'https://github.com/qutebrowser/qutebrowser/blob/main/doc/install.asciidoc' .format(name)] blocks.append('
'.join(lines)) if not webengine: diff --git a/scripts/asciidoc2html.py b/scripts/asciidoc2html.py index 09405c3e7..94c6fa4d9 100755 --- a/scripts/asciidoc2html.py +++ b/scripts/asciidoc2html.py @@ -84,9 +84,9 @@ class AsciiDoc: replacements = [ # patch image links to use local copy - ("https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-big.png", + ("https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-big.png", "qute://help/img/cheatsheet-big.png"), - ("https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/img/cheatsheet-small.png", + ("https://raw.githubusercontent.com/qutebrowser/qutebrowser/main/doc/img/cheatsheet-small.png", "qute://help/img/cheatsheet-small.png"), # patch relative links to work with qute://help flat structure diff --git a/scripts/dev/check_doc_changes.py b/scripts/dev/check_doc_changes.py index 53ef12090..b20a81455 100755 --- a/scripts/dev/check_doc_changes.py +++ b/scripts/dev/check_doc_changes.py @@ -31,7 +31,7 @@ from scripts import utils code = subprocess.run(['git', '--no-pager', 'diff', '--exit-code', '--stat', '--', 'doc'], check=False).returncode -if os.environ.get('GITHUB_REF', 'refs/heads/master') != 'refs/heads/master': +if os.environ.get('GITHUB_REF', 'refs/heads/main') != 'refs/heads/main': if code != 0: print("Docs changed but ignoring change as we're building a PR") sys.exit(0) diff --git a/scripts/dev/update_version.py b/scripts/dev/update_version.py index 6cf6a1013..7b399d025 100644 --- a/scripts/dev/update_version.py +++ b/scripts/dev/update_version.py @@ -68,7 +68,7 @@ if __name__ == "__main__": print("Run the following commands to create a new release:") print("* git push origin; git push origin v{v}".format(v=version)) if args.bump == 'patch': - print("* git checkout master && git cherry-pick v{v} && " + print("* git checkout main && git cherry-pick v{v} && " "git push origin".format(v=version)) else: print("* git branch v{x} v{v} && git push --set-upstream origin v{x}" diff --git a/tests/end2end/data/downloads/mhtml/complex/complex.html b/tests/end2end/data/downloads/mhtml/complex/complex.html index d44e9be0f..2cc5a52bb 100644 --- a/tests/end2end/data/downloads/mhtml/complex/complex.html +++ b/tests/end2end/data/downloads/mhtml/complex/complex.html @@ -80,7 +80,7 @@

...and how?

-

See +

See here for more information.

More useless trivia!

diff --git a/tox.ini b/tox.ini index 74eb5213a..8e8a87287 100644 --- a/tox.ini +++ b/tox.ini @@ -250,7 +250,7 @@ deps = {[testenv:mypy-pyqt6]deps} setenv = {[testenv:mypy-pyqt6]setenv} commands = {envpython} -m mypy --cobertura-xml-report {envtmpdir} {env:QUTE_CONSTANTS_ARGS} qutebrowser tests {posargs} - {envdir}/bin/diff-cover --fail-under=100 --compare-branch={env:DIFF_BRANCH:origin/{env:GITHUB_BASE_REF:master}} {envtmpdir}/cobertura.xml + {envdir}/bin/diff-cover --fail-under=100 --compare-branch={env:DIFF_BRANCH:origin/{env:GITHUB_BASE_REF:main}} {envtmpdir}/cobertura.xml [testenv:sphinx] basepython = {env:PYTHON:python3} diff --git a/www/header.asciidoc b/www/header.asciidoc index de6268f2e..111f03451 100644 --- a/www/header.asciidoc +++ b/www/header.asciidoc @@ -25,7 +25,7 @@ part-time on qutebrowser, funded by donations.

To sustain this for a long time, your help is needed! See the GitHub Sponsors page or -alternative +alternative donation methods for more information. Depending on your sign-up date and how long you keep a certain level, you can get qutebrowser t-shirts, stickers and more! -- cgit v1.2.3-54-g00ecf