Merge lp://qastaging/~jelmer/brz/ruff-format into lp://qastaging/brz
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | Jelmer Vernooij |
| Approved revision: | 7933 |
| Merged at revision: | 7932 |
| Proposed branch: | lp://qastaging/~jelmer/brz/ruff-format |
| Merge into: | lp://qastaging/brz |
| Diff against target: |
3143 lines (+300/-404) 157 files modified
breezy/__main__.py (+2/-2) breezy/builtins.py (+2/-3) breezy/bzr/_dirstate_helpers_py.py (+0/-1) breezy/bzr/branch.py (+2/-2) breezy/bzr/bundle/bundle_data.py (+9/-9) breezy/bzr/bundle/serializer/v08.py (+2/-2) breezy/bzr/bzrdir.py (+1/-1) breezy/bzr/dirstate.py (+5/-5) breezy/bzr/groupcompress.py (+1/-1) breezy/bzr/inventory.py (+1/-1) breezy/bzr/smart/protocol.py (+0/-1) breezy/bzr/smart/request.py (+0/-1) breezy/bzr/tests/__init__.py (+0/-1) breezy/bzr/tests/matchers.py (+2/-2) breezy/bzr/tests/per_bzrdir/test_bzrdir.py (+2/-2) breezy/bzr/tests/per_repository_vf/test__generate_text_key_index.py (+0/-1) breezy/bzr/tests/per_repository_vf/test_check.py (+0/-1) breezy/bzr/tests/per_repository_vf/test_fileid_involved.py (+1/-1) breezy/bzr/tests/per_repository_vf/test_find_text_key_references.py (+0/-1) breezy/bzr/tests/per_repository_vf/test_refresh_data.py (+1/-2) breezy/bzr/tests/per_repository_vf/test_write_group.py (+0/-1) breezy/bzr/tests/test_bundle.py (+8/-8) breezy/bzr/tests/test_dirstate.py (+3/-3) breezy/bzr/tests/test_serializer.py (+0/-1) breezy/bzr/tests/test_tag.py (+0/-1) breezy/bzr/transform.py (+1/-2) breezy/bzr/weave.py (+2/-2) breezy/bzr/workingtree.py (+1/-2) breezy/bzr/xml8.py (+1/-1) breezy/commands.py (+4/-7) breezy/config.py (+3/-3) breezy/controldir.py (+1/-1) breezy/crash.py (+2/-3) breezy/directory_service.py (+2/-2) breezy/git/branch.py (+3/-4) breezy/git/commit.py (+0/-1) breezy/git/errors.py (+0/-1) breezy/git/transform.py (+1/-2) breezy/git/unpeel_map.py (+0/-1) breezy/git/urls.py (+0/-1) breezy/info.py (+3/-3) breezy/lock.py (+17/-26) breezy/log.py (+2/-2) breezy/lsprof.py (+1/-2) breezy/mail_client.py (+10/-12) breezy/merge.py (+4/-5) breezy/mergetools.py (+1/-1) breezy/msgeditor.py (+2/-2) breezy/plugins/bash_completion/bashcomp.py (+2/-2) breezy/plugins/fastimport/bzr_commit_handler.py (+1/-1) breezy/plugins/fastimport/helpers.py (+1/-1) breezy/plugins/fastimport/processors/generic_processor.py (+0/-1) breezy/plugins/launchpad/lp_api.py (+0/-1) breezy/plugins/launchpad/test_lp_directory.py (+0/-1) breezy/plugins/stats/cmds.py (+0/-1) breezy/plugins/upload/__init__.py (+0/-1) breezy/plugins/weave_fmt/test_bzrdir.py (+1/-1) breezy/plugins/webdav/tests/dav_server.py (+1/-2) breezy/plugins/zsh_completion/zshcomp.py (+2/-2) breezy/push.py (+2/-2) breezy/reconfigure.py (+0/-1) breezy/symbol_versioning.py (+2/-2) breezy/tests/blackbox/__init__.py (+0/-1) breezy/tests/blackbox/test_add.py (+3/-3) breezy/tests/blackbox/test_added.py (+0/-1) breezy/tests/blackbox/test_aliases.py (+0/-1) breezy/tests/blackbox/test_annotate.py (+0/-1) breezy/tests/blackbox/test_branch.py (+2/-2) breezy/tests/blackbox/test_clean_tree.py (+0/-1) breezy/tests/blackbox/test_commit.py (+1/-1) breezy/tests/blackbox/test_conflicts.py (+6/-6) breezy/tests/blackbox/test_cp.py (+0/-1) breezy/tests/blackbox/test_debug.py (+0/-1) breezy/tests/blackbox/test_deleted.py (+0/-1) breezy/tests/blackbox/test_export.py (+3/-3) breezy/tests/blackbox/test_help.py (+0/-1) breezy/tests/blackbox/test_ignore.py (+0/-1) breezy/tests/blackbox/test_info.py (+3/-4) breezy/tests/blackbox/test_log.py (+0/-1) breezy/tests/blackbox/test_logformats.py (+0/-1) breezy/tests/blackbox/test_missing.py (+3/-3) breezy/tests/blackbox/test_modified.py (+0/-1) breezy/tests/blackbox/test_mv.py (+7/-7) breezy/tests/blackbox/test_non_ascii.py (+2/-2) breezy/tests/blackbox/test_push.py (+9/-11) breezy/tests/blackbox/test_reconcile.py (+0/-1) breezy/tests/blackbox/test_script.py (+0/-1) breezy/tests/blackbox/test_status.py (+1/-1) breezy/tests/blackbox/test_too_much.py (+0/-1) breezy/tests/blackbox/test_update.py (+20/-27) breezy/tests/blackbox/test_upgrade.py (+1/-0) breezy/tests/blackbox/test_versioning.py (+0/-1) breezy/tests/http_server.py (+1/-2) breezy/tests/per_branch/test_sprout.py (+1/-1) breezy/tests/per_branch/test_tags.py (+1/-1) breezy/tests/per_controldir/test_controldir.py (+3/-3) breezy/tests/per_foreign_vcs/test_repository.py (+0/-1) breezy/tests/per_interrepository/__init__.py (+0/-1) breezy/tests/per_interrepository/test_interrepository.py (+1/-1) breezy/tests/per_lock/__init__.py (+0/-1) breezy/tests/per_repository/test_commit_builder.py (+1/-1) breezy/tests/per_repository/test_fetch.py (+1/-1) breezy/tests/per_repository/test_file_graph.py (+0/-1) breezy/tests/per_repository/test_reconcile.py (+0/-1) breezy/tests/per_repository/test_repository.py (+1/-1) breezy/tests/per_repository_reference/test__make_parents_provider.py (+0/-1) breezy/tests/per_repository_reference/test_graph.py (+0/-1) breezy/tests/per_repository_reference/test_initialize.py (+0/-1) breezy/tests/per_transport.py (+5/-6) breezy/tests/per_tree/test_get_symlink_target.py (+1/-1) breezy/tests/per_tree/test_symlinks.py (+0/-1) breezy/tests/per_tree/test_test_trees.py (+23/-23) breezy/tests/per_uifactory/__init__.py (+0/-1) breezy/tests/per_workingtree/test_canonical_path.py (+0/-1) breezy/tests/per_workingtree/test_eol_conversion.py (+2/-2) breezy/tests/per_workingtree/test_inv.py (+0/-1) breezy/tests/per_workingtree/test_move.py (+7/-7) breezy/tests/per_workingtree/test_parents.py (+1/-1) breezy/tests/per_workingtree/test_pull.py (+1/-1) breezy/tests/per_workingtree/test_rename_one.py (+13/-13) breezy/tests/per_workingtree/test_transform.py (+4/-4) breezy/tests/per_workingtree/test_views.py (+2/-3) breezy/tests/per_workingtree/test_workingtree.py (+1/-1) breezy/tests/scenarios.py (+0/-1) breezy/tests/test_config.py (+5/-6) breezy/tests/test_debug.py (+0/-1) breezy/tests/test_decorators.py (+0/-1) breezy/tests/test_email_message.py (+4/-5) breezy/tests/test_eol_filters.py (+0/-1) breezy/tests/test_errors.py (+3/-4) breezy/tests/test_foreign.py (+0/-1) breezy/tests/test_http.py (+8/-8) breezy/tests/test_iterablefile.py (+0/-1) breezy/tests/test_lock.py (+0/-1) breezy/tests/test_lsprof.py (+0/-1) breezy/tests/test_mail_client.py (+1/-1) breezy/tests/test_mergetools.py (+1/-1) breezy/tests/test_msgeditor.py (+2/-2) breezy/tests/test_osutils.py (+4/-4) breezy/tests/test_reconcile.py (+0/-1) breezy/tests/test_shelf.py (+2/-2) breezy/tests/test_smtp_connection.py (+1/-1) breezy/tests/test_source.py (+5/-6) breezy/tests/test_switch.py (+0/-1) breezy/tests/test_tag.py (+0/-1) breezy/tests/test_transport_log.py (+0/-1) breezy/tests/test_uncommit.py (+0/-1) breezy/tests/test_version.py (+1/-1) breezy/tests/testui.py (+0/-1) breezy/transport/__init__.py (+2/-2) breezy/transport/gio_transport.py (+7/-7) breezy/transport/http/urllib.py (+2/-2) breezy/tree.py (+3/-3) breezy/tsort.py (+0/-1) breezy/ui/__init__.py (+2/-2) tools/generate_docs.py (+1/-0) tools/generate_release_notes.py (+0/-1) |
| To merge this branch: | bzr merge lp://qastaging/~jelmer/brz/ruff-format |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jelmer Vernooij | Approve | ||
|
Review via email:
|
|||
Commit message
Run ruff format
Description of the change
Run ruff format
To post a comment you must log in.
Revision history for this message
| Jelmer Vernooij (jelmer) | # |
review:
Approve
Revision history for this message
| The Breezy Bot (the-breezy-bot) wrote | # |
Download full text (17.0 KiB)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The attempt to merge lp:~jelmer/brz/ruff-format into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.
Collecting setuptools-gettext
Using cached setuptools_
Requirement already satisfied: setuptools>=60.8 in ./lib/python3.
Using cached setuptools_
Installing collected packages: setuptools-gettext
Successfully installed setuptools-
Obtaining file://
Installing build dependencies: started
Installing build dependencies: finished with status 'done'
Checking if build backend supports build_editable: started
Checking if build backend supports build_editable: finished with status 'done'
Getting requirements to build editable: started
Getting requirements to build editable: finished with status 'done'
Preparing editable metadata (pyproject.toml): started
Preparing editable metadata (pyproject.toml): finished with status 'done'
Requirement already satisfied: configobj in /usr/lib/
Requirement already satisfied: fastbencode in /usr/lib/
Requirement already satisfied: patiencediff in /usr/lib/
Requirement already satisfied: merge3 in /usr/lib/
Requirement already satisfied: dulwich>=0.21.6 in /usr/lib/
Requirement already satisfied: urllib3>=1.24.1 in /usr/lib/
Requirement already satisfied: pyyaml in /usr/lib/
Collecting testtools>=0.9.5 (from breezy==3.4.0.dev0)
Using cached testtools-
Collecting testscenarios (from breezy==3.4.0.dev0)
Using cached testscenarios-
Collecting python-subunit (from breezy==3.4.0.dev0)
Using cached python_
Collecting cython>=0.29 (from breezy==3.4.0.dev0)
Using cached Cython-
Requirement already satisfied: ruff in /usr/local/
Requirement already satisfied: types-paramiko in /usr/lib/
Requirement already satisfied: types-PyYAML in /usr/lib/
Collecting docutils (from breezy==3.4.0.dev0)
Using cached docutils-
Requirement already satisfied: setuptools in ./lib/python3.
Collecting sphinx (from breezy==3.4.0.dev0)
Using cached sphinx-
Collecting sphinx-epytext (from breezy==3.4.0.dev0)
Using cached sphinx_
Collecting fastimport (from breezy==3.4.0.dev0)
Using cached fastimp...