Merge into trunk : codespell : Code : Breezy

Status:	Needs review
Proposed branch:	lp://qastaging/~jelmer/brz/codespell
Merge into:	lp://qastaging/brz
Diff against target:	141234 lines (+71299/-1640) (has conflicts) 988 files modified Makefile (+1/-1) apport/source_brz.py (+10/-0) breezy/__init__.py (+9/-1) breezy/__main__.py (+9/-0) breezy/_annotator_py.py (+27/-0) breezy/_chunks_to_lines_py.py.OTHER (+58/-0) breezy/_known_graph_py.py (+16/-2) breezy/_readdir_py.py.OTHER (+50/-0) breezy/_termcolor.py.OTHER (+78/-0) breezy/_walkdirs_win32.pyx.OTHER (+302/-0) breezy/add.py (+37/-0) breezy/annotate.py (+67/-1) breezy/archive/__init__.py (+9/-0) breezy/archive/tar.py (+13/-0) breezy/archive/zip.py (+6/-0) breezy/atomicfile.py (+16/-0) breezy/bedding.py (+278/-0) breezy/bisect.py (+13/-0) breezy/branch.py (+141/-0) breezy/branchbuilder.py (+9/-0) breezy/breakin.py (+10/-0) breezy/bugtracker.py (+22/-0) breezy/builtins.py (+882/-9) breezy/bzr/__init__.py (+44/-0) breezy/bzr/_btree_serializer_pyx.pyx (+1/-1) breezy/bzr/_chk_map_py.py (+58/-0) breezy/bzr/_dirstate_helpers_py.py (+229/-0) breezy/bzr/_dirstate_helpers_pyx.pyx (+8/-8) breezy/bzr/_groupcompress_py.py.OTHER (+471/-0) breezy/bzr/_knit_load_data_py.py (+11/-1) breezy/bzr/_rio_py.py.OTHER (+73/-0) breezy/bzr/_simple_set_pyx.pyx (+2/-2) breezy/bzr/_static_tuple_c.c (+1/-1) breezy/bzr/_static_tuple_py.py (+12/-0) breezy/bzr/branch.py (+111/-2) breezy/bzr/btree_index.py (+132/-8) breezy/bzr/bundle/bundle_data.py (+235/-0) breezy/bzr/bundle/commands.py (+29/-0) breezy/bzr/bundle/serializer/__init__.py (+30/-1) breezy/bzr/bundle/serializer/v08.py (+86/-1) breezy/bzr/bundle/serializer/v4.py (+168/-12) breezy/bzr/bzrdir.py (+166/-1) breezy/bzr/check.py (+16/-1) breezy/bzr/chk_map.py (+219/-1) breezy/bzr/chk_serializer.py (+217/-0) breezy/bzr/conflicts.py (+37/-3) breezy/bzr/debug_commands.py (+28/-0) breezy/bzr/dirstate.py (+811/-12) breezy/bzr/fetch.py (+23/-0) breezy/bzr/fullhistory.py (+22/-1) breezy/bzr/generate_ids.py (+110/-0) breezy/bzr/groupcompress.py (+398/-6) breezy/bzr/groupcompress_repo.py (+244/-6) breezy/bzr/hashcache.py.OTHER (+313/-0) breezy/bzr/index.py (+107/-3) breezy/bzr/inventory.py (+1767/-3) breezy/bzr/inventory_delta.py (+338/-0) breezy/bzr/inventorytree.py (+173/-3) breezy/bzr/knit.py (+330/-8) breezy/bzr/knitpack_repo.py (+157/-1) breezy/bzr/knitrepo.py (+83/-1) breezy/bzr/lockable_files.py (+48/-0) breezy/bzr/pack.py (+17/-0) breezy/bzr/pack_repo.py (+230/-7) breezy/bzr/reconcile.py (+34/-1) breezy/bzr/recordcounter.py (+1/-1) breezy/bzr/remote.py (+513/-54) breezy/bzr/repository.py (+31/-0) breezy/bzr/rio.py.OTHER (+354/-0) breezy/bzr/serializer.py (+17/-0) breezy/bzr/smart/branch.py (+18/-1) breezy/bzr/smart/bzrdir.py (+84/-4) breezy/bzr/smart/client.py (+86/-0) breezy/bzr/smart/medium.py (+131/-1) breezy/bzr/smart/message.py (+100/-0) breezy/bzr/smart/packrepository.py (+12/-1) breezy/bzr/smart/ping.py (+26/-0) breezy/bzr/smart/protocol.py (+234/-2) breezy/bzr/smart/repository.py (+99/-2) breezy/bzr/smart/request.py (+612/-1) breezy/bzr/smart/server.py (+6/-1) breezy/bzr/static_tuple.py (+8/-0) breezy/bzr/tag.py (+23/-0) breezy/bzr/testament.py (+33/-0) breezy/bzr/tests/__init__.py (+69/-0) breezy/bzr/tests/blackbox/__init__.py (+7/-1) breezy/bzr/tests/blackbox/test_dump_btree.py (+12/-0) breezy/bzr/tests/matchers.py (+16/-0) breezy/bzr/tests/per_bzrdir/__init__.py (+11/-1) breezy/bzr/tests/per_bzrdir/test_bzrdir.py (+150/-1) breezy/bzr/tests/per_inventory/__init__.py (+15/-0) breezy/bzr/tests/per_inventory/basics.py (+420/-12) breezy/bzr/tests/per_pack_repository.py (+197/-0) breezy/bzr/tests/per_repository_chk/__init__.py (+24/-1) breezy/bzr/tests/per_repository_chk/test_supported.py (+38/-0) breezy/bzr/tests/per_repository_vf/__init__.py (+27/-1) breezy/bzr/tests/per_repository_vf/helpers.py (+43/-0) breezy/bzr/tests/per_repository_vf/test__generate_text_key_index.py (+4/-0) breezy/bzr/tests/per_repository_vf/test_add_inventory_by_delta.py (+35/-0) breezy/bzr/tests/per_repository_vf/test_check.py (+23/-0) breezy/bzr/tests/per_repository_vf/test_check_reconcile.py (+197/-1) breezy/bzr/tests/per_repository_vf/test_fetch.py (+19/-0) breezy/bzr/tests/per_repository_vf/test_fileid_involved.py (+58/-3) breezy/bzr/tests/per_repository_vf/test_find_text_key_references.py (+5/-0) breezy/bzr/tests/per_repository_vf/test_merge_directive.py (+24/-0) breezy/bzr/tests/per_repository_vf/test_reconcile.py (+133/-2) breezy/bzr/tests/per_repository_vf/test_refresh_data.py (+25/-0) breezy/bzr/tests/per_repository_vf/test_repository.py (+102/-2) breezy/bzr/tests/per_repository_vf/test_write_group.py (+50/-5) breezy/bzr/tests/per_versionedfile.py (+354/-25) breezy/bzr/tests/test__btree_serializer.py (+28/-0) breezy/bzr/tests/test__chk_map.py (+118/-2) breezy/bzr/tests/test__dirstate_helpers.py (+748/-138) breezy/bzr/tests/test__groupcompress.py (+296/-0) breezy/bzr/tests/test__rio.py.OTHER (+108/-0) breezy/bzr/tests/test__simple_set.py (+27/-0) breezy/bzr/tests/test__static_tuple.py (+54/-0) breezy/bzr/tests/test_btree_index.py (+151/-41) breezy/bzr/tests/test_bundle.py (+335/-2) breezy/bzr/tests/test_bzrdir.py (+304/-9) breezy/bzr/tests/test_chk_map.py (+164/-2) breezy/bzr/tests/test_chk_serializer.py (+62/-0) breezy/bzr/tests/test_conflicts.py (+19/-0) breezy/bzr/tests/test_dirstate.py (+495/-11) breezy/bzr/tests/test_generate_ids.py (+72/-5) breezy/bzr/tests/test_groupcompress.py (+248/-4) breezy/bzr/tests/test_hashcache.py (+109/-0) breezy/bzr/tests/test_index.py (+96/-2) breezy/bzr/tests/test_inv.py (+767/-6) breezy/bzr/tests/test_inventory_delta.py (+390/-0) breezy/bzr/tests/test_knit.py (+120/-2) breezy/bzr/tests/test_lockable_files.py (+39/-1) breezy/bzr/tests/test_matchers.py (+9/-0) breezy/bzr/tests/test_pack.py (+23/-2) breezy/bzr/tests/test_remote.py (+260/-2) breezy/bzr/tests/test_repository.py (+147/-1) breezy/bzr/tests/test_rio.py (+225/-0) breezy/bzr/tests/test_serializer.py (+22/-0) breezy/bzr/tests/test_smart.py (+124/-0) breezy/bzr/tests/test_smart_request.py (+15/-0) breezy/bzr/tests/test_smart_transport.py (+326/-6) breezy/bzr/tests/test_tag.py (+13/-0) breezy/bzr/tests/test_testament.py (+45/-0) breezy/bzr/tests/test_transform.py (+47/-0) breezy/bzr/tests/test_tuned_gzip.py (+7/-0) breezy/bzr/tests/test_versionedfile.py (+12/-0) breezy/bzr/tests/test_vf_search.py (+26/-0) breezy/bzr/tests/test_vfs_ratchet.py (+20/-0) breezy/bzr/tests/test_weave.py (+29/-0) breezy/bzr/tests/test_workingtree_4.py (+75/-0) breezy/bzr/tests/test_xml.py (+254/-2) breezy/bzr/textinv.py.OTHER (+94/-0) breezy/bzr/transform.py (+129/-3) breezy/bzr/versionedfile.py (+332/-7) breezy/bzr/vf_repository.py (+406/-9) breezy/bzr/vf_search.py (+87/-0) breezy/bzr/weave.py (+112/-0) breezy/bzr/weavefile.py (+34/-0) breezy/bzr/workingtree.py (+216/-8) breezy/bzr/workingtree_3.py (+54/-0) breezy/bzr/workingtree_4.py (+280/-5) breezy/bzr/xml5.py (+68/-0) breezy/bzr/xml6.py (+9/-0) breezy/bzr/xml7.py (+18/-0) breezy/bzr/xml8.py (+166/-12) breezy/bzr/xml_serializer.py (+277/-0) breezy/bzr_distutils.py.OTHER (+124/-0) breezy/cache_utf8.py (+20/-0) breezy/check.py (+12/-0) breezy/clean_tree.py (+47/-0) breezy/cmd_test_script.py (+7/-0) breezy/cmd_version_info.py (+13/-0) breezy/cmdline.py (+11/-1) breezy/colordiff.py (+22/-0) breezy/commands.py (+180/-1) breezy/commit.py (+77/-2) breezy/commit_signature_commands.py (+10/-0) breezy/config.py (+290/-9) breezy/conflicts.py (+44/-0) breezy/controldir.py (+77/-0) breezy/counted_lock.py (+10/-0) breezy/crash.py (+60/-0) breezy/debug.py (+6/-1) breezy/decorators.py (+9/-0) breezy/delta.py (+88/-0) breezy/diff.py (+207/-7) breezy/directory_service.py (+45/-0) breezy/doc/api/__init__.py (+12/-0) breezy/doc_generate/autodoc_man.py (+14/-0) breezy/doc_generate/autodoc_rstx.py (+5/-0) breezy/email_message.py (+13/-0) breezy/errors.py (+112/-0) breezy/estimate_compressed_size.py.OTHER (+68/-0) breezy/export.py (+54/-0) breezy/export_pot.py (+40/-0) breezy/externalcommand.py (+9/-0) breezy/fifo_cache.py (+11/-0) breezy/filter_tree.py (+10/-0) breezy/filters/__init__.py (+21/-0) breezy/foreign.py (+19/-0) breezy/forge.py (+9/-0) breezy/git/__init__.py (+207/-1) breezy/git/annotate.py (+43/-0) breezy/git/branch.py (+187/-1) breezy/git/cache.py (+44/-0) breezy/git/commands.py (+119/-0) breezy/git/commit.py (+37/-0) breezy/git/config.py (+18/-0) breezy/git/dir.py (+119/-0) breezy/git/fetch.py (+149/-3) breezy/git/filegraph.py (+30/-0) breezy/git/git_remote_helper.py (+28/-0) breezy/git/interrepo.py (+146/-0) breezy/git/mapping.py (+180/-0) breezy/git/memorytree.py (+30/-0) breezy/git/object_store.py (+156/-1) breezy/git/pristine_tar.py (+12/-0) breezy/git/push.py (+18/-0) breezy/git/refs.py (+29/-0) breezy/git/remote.py (+177/-1) breezy/git/repository.py (+71/-0) breezy/git/revspec.py (+44/-0) breezy/git/roundtrip.py (+5/-0) breezy/git/send.py (+49/-0) breezy/git/server.py (+38/-0) breezy/git/tests/__init__.py (+26/-0) breezy/git/tests/test_blackbox.py (+131/-0) breezy/git/tests/test_branch.py (+73/-0) breezy/git/tests/test_builder.py (+26/-0) breezy/git/tests/test_cache.py (+52/-2) breezy/git/tests/test_dir.py (+30/-0) breezy/git/tests/test_fetch.py (+98/-0) breezy/git/tests/test_git_remote_helper.py (+36/-0) breezy/git/tests/test_mapping.py (+69/-1) breezy/git/tests/test_object_store.py (+74/-0) breezy/git/tests/test_pristine_tar.py (+22/-1) breezy/git/tests/test_push.py (+20/-0) breezy/git/tests/test_refs.py (+8/-0) breezy/git/tests/test_remote.py (+301/-54) breezy/git/tests/test_repository.py (+96/-0) breezy/git/tests/test_revspec.py (+7/-0) breezy/git/tests/test_server.py (+12/-0) breezy/git/tests/test_transportgit.py (+25/-7) breezy/git/tests/test_tree.py (+28/-0) breezy/git/tests/test_unpeel_map.py (+10/-0) breezy/git/tests/test_urls.py (+6/-0) breezy/git/tests/test_workingtree.py (+83/-0) breezy/git/transform.py (+129/-0) breezy/git/transportgit.py (+88/-4) breezy/git/tree.py (+270/-4) breezy/git/unpeel_map.py (+15/-0) breezy/git/urls.py (+24/-0) breezy/git/workingtree.py (+220/-2) breezy/globbing.py (+134/-1) breezy/gpg.py (+71/-1) breezy/graph.py (+133/-1) breezy/grep.py (+79/-5) breezy/help.py (+52/-0) breezy/help_topics/__init__.py (+819/-31) breezy/help_topics/en/configuration.txt (+5/-5) breezy/help_topics/en/content-filters.txt (+1/-1) breezy/help_topics/en/eol.txt (+1/-1) breezy/help_topics/en/glossary.txt (+2/-2) breezy/help_topics/es/conflict-types.txt (+9/-9) breezy/hooks.py (+13/-0) breezy/i18n.py (+94/-0) breezy/identitymap.py (+14/-0) breezy/ignores.py (+52/-0) breezy/info.py (+124/-0) breezy/iterablefile.py.OTHER (+279/-0) breezy/lazy_import.py (+23/-1) breezy/lazy_regex.py (+7/-0) breezy/library_state.py (+1/-1) breezy/location.py (+102/-0) breezy/lock.py (+343/-0) breezy/lockdir.py (+241/-2) breezy/log.py (+324/-1) breezy/lru_cache.py (+17/-0) breezy/lsprof.py (+46/-1) breezy/mail_client.py (+239/-2) breezy/memorybranch.py (+4/-0) breezy/memorytree.py (+9/-0) breezy/merge.py (+163/-1) breezy/merge_directive.py (+260/-6) breezy/mergeable.py (+24/-1) breezy/mergetools.py (+19/-3) breezy/missing.py (+44/-0) breezy/msgeditor.py (+63/-0) breezy/multiparent.py (+96/-7) breezy/multiwalker.py (+20/-0) breezy/mutabletree.py (+31/-8) breezy/option.py (+150/-9) breezy/osutils.py (+1797/-10) breezy/patch.py (+211/-0) breezy/patches.py (+186/-0) breezy/plugin.py (+108/-2) breezy/plugins/bash_completion/__init__.py (+26/-6) breezy/plugins/bash_completion/bashcomp.py (+113/-1) breezy/plugins/bash_completion/tests/__init__.py (+10/-0) breezy/plugins/bash_completion/tests/test_bashcomp.py (+83/-0) breezy/plugins/changelog_merge/__init__.py (+10/-0) breezy/plugins/changelog_merge/changelog_merge.py (+27/-0) breezy/plugins/changelog_merge/tests/__init__.py (+10/-0) breezy/plugins/changelog_merge/tests/test_changelog_merge.py (+7/-0) breezy/plugins/commitfromnews/__init__.py (+19/-0) breezy/plugins/commitfromnews/committemplate.py (+1/-1) breezy/plugins/commitfromnews/tests/__init__.py (+11/-0) breezy/plugins/commitfromnews/tests/test_committemplate.py (+8/-0) breezy/plugins/cvs/__init__.py (+4/-0) breezy/plugins/darcs/__init__.py (+7/-0) breezy/plugins/email/emailer.py (+84/-0) breezy/plugins/email/tests/testemail.py (+36/-0) breezy/plugins/fastimport/__init__.py (+14/-0) breezy/plugins/fastimport/branch_mapper.py (+8/-0) breezy/plugins/fastimport/branch_updater.py (+18/-0) breezy/plugins/fastimport/bzr_commit_handler.py (+245/-4) breezy/plugins/fastimport/cache_manager.py (+12/-0) breezy/plugins/fastimport/cmds.py (+29/-3) breezy/plugins/fastimport/doc/notes.txt (+1/-1) breezy/plugins/fastimport/exporter.py (+81/-1) breezy/plugins/fastimport/helpers.py (+27/-0) breezy/plugins/fastimport/processors/generic_processor.py (+47/-1) breezy/plugins/fastimport/revision_store.py (+61/-0) breezy/plugins/fastimport/tests/test_branch_mapper.py (+11/-0) breezy/plugins/fastimport/tests/test_commands.py (+16/-0) breezy/plugins/fastimport/tests/test_exporter.py (+9/-0) breezy/plugins/fastimport/tests/test_generic_processor.py (+155/-1) breezy/plugins/fastimport/tests/test_head_tracking.py (+16/-0) breezy/plugins/fastimport/tests/test_revision_store.py (+47/-0) breezy/plugins/flake8/__init__.py.OTHER (+136/-0) breezy/plugins/fossil/__init__.py (+9/-0) breezy/plugins/github/cmds.py (+18/-0) breezy/plugins/github/forge.py (+200/-5) breezy/plugins/gitlab/cmds.py (+19/-0) breezy/plugins/gitlab/forge.py (+231/-0) breezy/plugins/gitlab/tests/test_forge.py (+7/-1) breezy/plugins/hg/__init__.py (+12/-0) breezy/plugins/launchpad/__init__.py (+27/-0) breezy/plugins/launchpad/account.py (+14/-0) breezy/plugins/launchpad/cmds.py (+41/-2) breezy/plugins/launchpad/forge.py (+129/-2) breezy/plugins/launchpad/lp_api.py (+40/-0) breezy/plugins/launchpad/lp_directory.py (+116/-0) breezy/plugins/launchpad/test_lp_api.py (+18/-0) breezy/plugins/launchpad/test_lp_directory.py (+357/-0) breezy/plugins/launchpad/uris.py (+12/-0) breezy/plugins/mtn/__init__.py (+4/-0) breezy/plugins/netrc_credential_store/__init__.py (+23/-1) breezy/plugins/netrc_credential_store/tests/__init__.py (+10/-0) breezy/plugins/netrc_credential_store/tests/test_netrc.py (+28/-0) breezy/plugins/news_merge/tests/test_news_merge.py (+9/-0) breezy/plugins/po_merge/__init__.py (+10/-0) breezy/plugins/po_merge/po_merge.py (+41/-0) breezy/plugins/po_merge/tests/__init__.py (+10/-0) breezy/plugins/po_merge/tests/test_po_merge.py (+32/-0) breezy/plugins/propose/cmds.py (+155/-0) breezy/plugins/pypi/__init__.py (+6/-0) breezy/plugins/pypi/directory.py (+4/-0) breezy/plugins/quilt/__init__.py (+46/-0) breezy/plugins/quilt/merge.py (+12/-0) breezy/plugins/quilt/tests/__init__.py (+28/-1) breezy/plugins/quilt/tests/test_merge.py (+23/-0) breezy/plugins/quilt/tests/test_wrapper.py (+7/-0) breezy/plugins/quilt/wrapper.py (+26/-0) breezy/plugins/repodebug/check_chk.py (+26/-0) breezy/plugins/repodebug/chk_used_by.py (+30/-0) breezy/plugins/repodebug/fetch_all_records.py (+8/-0) breezy/plugins/repodebug/file_refs.py (+8/-0) breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py (+14/-0) breezy/plugins/rewrite/__init__.py (+42/-0) breezy/plugins/rewrite/commands.py (+105/-3) breezy/plugins/rewrite/maptree.py (+24/-0) breezy/plugins/rewrite/pseudonyms.py (+14/-0) breezy/plugins/rewrite/rebase.py (+81/-1) breezy/plugins/rewrite/tests/__init__.py (+14/-0) breezy/plugins/rewrite/tests/test_maptree.py (+15/-0) breezy/plugins/rewrite/tests/test_pseudonyms.py (+10/-0) breezy/plugins/rewrite/tests/test_rebase.py (+39/-0) breezy/plugins/rewrite/tests/test_upgrade.py (+10/-0) breezy/plugins/rewrite/upgrade.py (+23/-0) breezy/plugins/stats/cmds.py (+59/-0) breezy/plugins/stats/test_stats.py (+24/-0) breezy/plugins/svn/__init__.py (+30/-0) breezy/plugins/svn/revspec.py (+7/-0) breezy/plugins/upload/NEWS (+2/-2) breezy/plugins/upload/__init__.py (+34/-1) breezy/plugins/upload/cmds.py (+129/-0) breezy/plugins/upload/tests/__init__.py (+11/-0) breezy/plugins/upload/tests/test_auto_upload_hook.py (+13/-0) breezy/plugins/upload/tests/test_upload.py (+81/-1) breezy/plugins/weave_fmt/__init__.py (+32/-0) breezy/plugins/weave_fmt/branch.py (+53/-1) breezy/plugins/weave_fmt/bzrdir.py (+160/-7) breezy/plugins/weave_fmt/repository.py (+125/-1) breezy/plugins/weave_fmt/store/__init__.py (+36/-0) breezy/plugins/weave_fmt/store/versioned.py (+32/-1) breezy/plugins/weave_fmt/test_bzrdir.py (+83/-2) breezy/plugins/weave_fmt/test_repository.py (+45/-0) breezy/plugins/weave_fmt/test_store.py (+5/-0) breezy/plugins/weave_fmt/test_workingtree.py (+37/-0) breezy/plugins/weave_fmt/workingtree.py (+40/-0) breezy/plugins/weave_fmt/xml4.py (+137/-1) breezy/plugins/webdav/NOTES (+1/-1) breezy/plugins/webdav/TODO (+2/-2) breezy/plugins/webdav/__init__.py (+33/-9) breezy/plugins/webdav/tests/__init__.py (+10/-0) breezy/plugins/webdav/tests/dav_server.py (+125/-4) breezy/plugins/webdav/tests/test_webdav.py (+10/-0) breezy/plugins/webdav/webdav.py (+127/-2) breezy/plugins/zsh_completion/__init__.py (+22/-4) breezy/plugins/zsh_completion/tests/__init__.py (+10/-0) breezy/plugins/zsh_completion/zshcomp.py (+33/-0) breezy/progress.py (+46/-0) breezy/push.py (+109/-0) breezy/pyutils.py (+5/-0) breezy/reconcile.py (+18/-0) breezy/reconfigure.py (+39/-0) breezy/registry.py (+102/-1) breezy/rename_map.py (+14/-0) breezy/repository.py (+140/-6) breezy/revision.py (+167/-0) breezy/revisionspec.py (+69/-0) breezy/revisiontree.py (+18/-0) breezy/rules.py (+11/-0) breezy/send.py (+85/-0) breezy/shelf.py (+16/-3) breezy/shelf_ui.py (+7/-0) breezy/shellcomplete.py (+16/-0) breezy/smtp_connection.py (+37/-0) breezy/status.py (+45/-0) breezy/switch.py (+14/-0) breezy/symbol_versioning.py (+83/-2) breezy/tag.py (+21/-0) breezy/terminal.py (+75/-0) breezy/tests/TestUtil.py (+5/-1) breezy/tests/__init__.py (+717/-20) breezy/tests/blackbox/test_add.py (+105/-9) breezy/tests/blackbox/test_added.py (+29/-0) breezy/tests/blackbox/test_alias.py (+22/-0) breezy/tests/blackbox/test_aliases.py (+12/-1) breezy/tests/blackbox/test_annotate.py (+111/-32) breezy/tests/blackbox/test_big_file.py (+11/-0) breezy/tests/blackbox/test_bisect.py (+55/-10) breezy/tests/blackbox/test_bound_branches.py (+26/-0) breezy/tests/blackbox/test_branch.py (+164/-0) breezy/tests/blackbox/test_break_lock.py (+29/-0) breezy/tests/blackbox/test_bundle_info.py (+23/-0) breezy/tests/blackbox/test_cat.py (+33/-10) breezy/tests/blackbox/test_cat_revision.py (+15/-0) breezy/tests/blackbox/test_check.py (+34/-0) breezy/tests/blackbox/test_checkout.py (+31/-0) breezy/tests/blackbox/test_clean_tree.py (+38/-0) breezy/tests/blackbox/test_clone.py (+21/-0) breezy/tests/blackbox/test_commit.py (+295/-0) breezy/tests/blackbox/test_config.py (+17/-0) breezy/tests/blackbox/test_conflicts.py (+67/-0) breezy/tests/blackbox/test_cp.py (+20/-0) breezy/tests/blackbox/test_debug.py (+20/-0) breezy/tests/blackbox/test_deleted.py (+11/-0) breezy/tests/blackbox/test_diff.py (+285/-2) breezy/tests/blackbox/test_exceptions.py (+44/-0) breezy/tests/blackbox/test_export.py (+40/-0) breezy/tests/blackbox/test_export_pot.py (+6/-0) breezy/tests/blackbox/test_filesystem_cicp.py (+114/-0) breezy/tests/blackbox/test_filtered_view_ops.py (+123/-0) breezy/tests/blackbox/test_find_merge_base.py (+8/-0) breezy/tests/blackbox/test_help.py (+106/-0) breezy/tests/blackbox/test_ignore.py (+63/-0) breezy/tests/blackbox/test_ignored.py (+10/-0) breezy/tests/blackbox/test_import.py (+13/-0) breezy/tests/blackbox/test_info.py (+393/-0) breezy/tests/blackbox/test_init.py (+85/-20) breezy/tests/blackbox/test_inventory.py (+7/-0) breezy/tests/blackbox/test_join.py (+14/-0) breezy/tests/blackbox/test_link_tree.py (+16/-1) breezy/tests/blackbox/test_locale.py (+18/-0) breezy/tests/blackbox/test_log.py (+78/-1) breezy/tests/blackbox/test_logformats.py (+37/-0) breezy/tests/blackbox/test_lookup_revision.py (+9/-0) breezy/tests/blackbox/test_ls.py (+79/-0) breezy/tests/blackbox/test_merge.py (+224/-0) breezy/tests/blackbox/test_merge_directive.py (+25/-0) breezy/tests/blackbox/test_missing.py (+24/-0) breezy/tests/blackbox/test_modified.py (+31/-0) breezy/tests/blackbox/test_mv.py (+51/-0) breezy/tests/blackbox/test_nick.py (+48/-0) breezy/tests/blackbox/test_non_ascii.py (+179/-0) breezy/tests/blackbox/test_outside_wt.py (+31/-0) breezy/tests/blackbox/test_pack.py (+48/-0) breezy/tests/blackbox/test_patch.py (+16/-0) breezy/tests/blackbox/test_ping.py (+8/-0) breezy/tests/blackbox/test_plugins.py (+9/-0) breezy/tests/blackbox/test_pull.py (+171/-0) breezy/tests/blackbox/test_push.py (+185/-1) breezy/tests/blackbox/test_re_sign.py (+28/-0) breezy/tests/blackbox/test_reconcile.py (+39/-0) breezy/tests/blackbox/test_reconfigure.py (+158/-4) breezy/tests/blackbox/test_reference.py (+52/-6) breezy/tests/blackbox/test_remember_option.py (+58/-0) breezy/tests/blackbox/test_remerge.py (+115/-0) breezy/tests/blackbox/test_remove.py (+94/-0) breezy/tests/blackbox/test_remove_tree.py (+67/-0) breezy/tests/blackbox/test_repair_workingtree.py (+13/-0) breezy/tests/blackbox/test_resolve.py (+36/-0) breezy/tests/blackbox/test_resolve_location.py (+9/-0) breezy/tests/blackbox/test_revert.py (+7/-0) breezy/tests/blackbox/test_revision_history.py (+7/-0) breezy/tests/blackbox/test_revision_info.py (+4/-0) breezy/tests/blackbox/test_revno.py (+59/-0) breezy/tests/blackbox/test_rmbranch.py (+45/-0) breezy/tests/blackbox/test_script.py (+11/-0) breezy/tests/blackbox/test_selftest.py (+34/-11) breezy/tests/blackbox/test_send.py (+66/-0) breezy/tests/blackbox/test_serve.py (+60/-0) breezy/tests/blackbox/test_shared_repository.py (+15/-0) breezy/tests/blackbox/test_shelve.py (+47/-0) breezy/tests/blackbox/test_sign_my_commits.py (+7/-0) breezy/tests/blackbox/test_status.py (+292/-0) breezy/tests/blackbox/test_switch.py (+99/-0) breezy/tests/blackbox/test_tags.py (+62/-0) breezy/tests/blackbox/test_testament.py (+4/-0) breezy/tests/blackbox/test_too_much.py (+155/-2) breezy/tests/blackbox/test_uncommit.py (+29/-0) breezy/tests/blackbox/test_unknowns.py (+8/-0) breezy/tests/blackbox/test_update.py (+152/-0) breezy/tests/blackbox/test_upgrade.py (+157/-0) breezy/tests/blackbox/test_verify_signatures.py (+7/-0) breezy/tests/blackbox/test_version.py (+51/-0) breezy/tests/blackbox/test_version_info.py (+21/-0) breezy/tests/blackbox/test_versioning.py (+66/-0) breezy/tests/blackbox/test_view.py (+16/-0) breezy/tests/blackbox/test_whoami.py (+69/-0) breezy/tests/commands/test_cat.py (+6/-0) breezy/tests/commands/test_commit.py (+8/-0) breezy/tests/commands/test_init.py (+8/-1) breezy/tests/commands/test_init_repository.py (+8/-1) breezy/tests/commands/test_merge.py (+7/-0) breezy/tests/commands/test_missing.py (+1/-1) breezy/tests/commands/test_pull.py (+25/-2) breezy/tests/commands/test_push.py (+8/-1) breezy/tests/commands/test_revert.py (+14/-0) breezy/tests/commands/test_update.py (+11/-0) breezy/tests/features.py (+98/-14) breezy/tests/file_utils.py (+1/-1) breezy/tests/fixtures.py (+5/-0) breezy/tests/http_server.py (+33/-1) breezy/tests/http_utils.py (+79/-2) breezy/tests/https_server.py (+21/-0) breezy/tests/lock_helpers.py (+15/-0) breezy/tests/matchers.py (+38/-0) breezy/tests/per_branch/__init__.py (+25/-0) breezy/tests/per_branch/test_branch.py (+148/-1) breezy/tests/per_branch/test_break_lock.py (+9/-0) breezy/tests/per_branch/test_check.py (+17/-0) breezy/tests/per_branch/test_commit.py (+17/-1) breezy/tests/per_branch/test_config.py (+8/-0) breezy/tests/per_branch/test_create_checkout.py (+6/-0) breezy/tests/per_branch/test_create_clone.py (+94/-22) breezy/tests/per_branch/test_hooks.py (+20/-0) breezy/tests/per_branch/test_http.py (+11/-0) breezy/tests/per_branch/test_iter_merge_sorted_revisions.py (+31/-0) breezy/tests/per_branch/test_locking.py (+29/-0) breezy/tests/per_branch/test_parent.py (+20/-0) breezy/tests/per_branch/test_permissions.py (+37/-1) breezy/tests/per_branch/test_pull.py (+94/-0) breezy/tests/per_branch/test_push.py (+74/-3) breezy/tests/per_branch/test_reconcile.py (+13/-0) breezy/tests/per_branch/test_sprout.py (+49/-0) breezy/tests/per_branch/test_stacking.py (+127/-2) breezy/tests/per_branch/test_tags.py (+37/-0) breezy/tests/per_branch/test_uncommit.py (+16/-1) breezy/tests/per_branch/test_update.py (+29/-2) breezy/tests/per_controldir/__init__.py (+18/-1) breezy/tests/per_controldir/test_controldir.py (+507/-0) breezy/tests/per_controldir/test_format.py (+7/-0) breezy/tests/per_controldir/test_push.py (+64/-0) breezy/tests/per_controldir_colo/__init__.py (+19/-1) breezy/tests/per_controldir_colo/test_supported.py (+94/-0) breezy/tests/per_controldir_colo/test_unsupported.py (+22/-0) breezy/tests/per_foreign_vcs/__init__.py (+24/-0) breezy/tests/per_foreign_vcs/test_branch.py (+15/-0) breezy/tests/per_foreign_vcs/test_repository.py (+7/-0) breezy/tests/per_interbranch/__init__.py (+17/-0) breezy/tests/per_interbranch/test_copy_content_into.py (+10/-0) breezy/tests/per_interbranch/test_fetch.py (+29/-0) breezy/tests/per_interbranch/test_get.py (+9/-0) breezy/tests/per_interbranch/test_pull.py (+133/-0) breezy/tests/per_interbranch/test_push.py (+179/-3) breezy/tests/per_interrepository/__init__.py (+49/-0) breezy/tests/per_interrepository/test_fetch.py (+120/-0) breezy/tests/per_interrepository/test_interrepository.py (+58/-0) breezy/tests/per_intertree/__init__.py (+22/-0) breezy/tests/per_intertree/test_compare.py (+195/-1) breezy/tests/per_intertree/test_find_path.py (+8/-0) breezy/tests/per_lock/__init__.py (+24/-0) breezy/tests/per_lock/test_lock.py (+16/-0) breezy/tests/per_lock/test_temporary_write_lock.py (+7/-0) breezy/tests/per_merger.py (+44/-1) breezy/tests/per_repository/__init__.py (+20/-0) breezy/tests/per_repository/test_add_fallback_repository.py (+7/-0) breezy/tests/per_repository/test_break_lock.py (+7/-0) breezy/tests/per_repository/test_check.py (+15/-0) breezy/tests/per_repository/test_commit_builder.py (+89/-3) breezy/tests/per_repository/test_fetch.py (+59/-0) breezy/tests/per_repository/test_file_graph.py (+3/-0) breezy/tests/per_repository/test_get_parent_map.py (+5/-0) breezy/tests/per_repository/test_has_revisions.py (+7/-0) breezy/tests/per_repository/test_has_same_location.py (+32/-0) breezy/tests/per_repository/test_pack.py (+9/-0) breezy/tests/per_repository/test_reconcile.py (+6/-0) breezy/tests/per_repository/test_refresh_data.py (+6/-0) breezy/tests/per_repository/test_repository.py (+122/-0) breezy/tests/per_repository/test_revision.py (+35/-0) breezy/tests/per_repository/test_signatures.py (+22/-0) breezy/tests/per_repository/test_statistics.py (+28/-9) breezy/tests/per_repository/test_write_group.py (+15/-0) breezy/tests/per_repository_reference/__init__.py (+25/-0) breezy/tests/per_repository_reference/test_add_inventory.py (+4/-0) breezy/tests/per_repository_reference/test_add_revision.py (+4/-0) breezy/tests/per_repository_reference/test_add_signature_text.py (+4/-0) breezy/tests/per_repository_reference/test_break_lock.py (+7/-0) breezy/tests/per_repository_reference/test_check.py (+14/-0) breezy/tests/per_repository_reference/test_commit_with_stacking.py (+11/-0) breezy/tests/per_repository_reference/test_default_stacking.py (+8/-0) breezy/tests/per_repository_reference/test_fetch.py (+21/-0) breezy/tests/per_repository_reference/test_get_record_stream.py (+40/-0) breezy/tests/per_repository_reference/test_graph.py (+29/-0) breezy/tests/per_repository_reference/test_initialize.py (+7/-0) breezy/tests/per_repository_reference/test_unlock.py (+12/-0) breezy/tests/per_transport.py (+154/-11) breezy/tests/per_tree/__init__.py (+47/-0) breezy/tests/per_tree/test_archive.py (+14/-0) breezy/tests/per_tree/test_export.py (+14/-0) breezy/tests/per_tree/test_get_file_mtime.py (+8/-0) breezy/tests/per_tree/test_get_root_id.py (+15/-2) breezy/tests/per_tree/test_get_symlink_target.py (+11/-0) breezy/tests/per_tree/test_ids.py (+7/-0) breezy/tests/per_tree/test_is_executable.py (+9/-0) breezy/tests/per_tree/test_list_files.py (+8/-0) breezy/tests/per_tree/test_path_content_summary.py (+20/-0) breezy/tests/per_tree/test_revision_tree.py (+7/-0) breezy/tests/per_tree/test_symlinks.py (+24/-0) breezy/tests/per_tree/test_test_trees.py (+30/-1) breezy/tests/per_tree/test_transform.py (+53/-0) breezy/tests/per_tree/test_tree.py (+16/-0) breezy/tests/per_tree/test_walkdirs.py (+8/-0) breezy/tests/per_uifactory/__init__.py (+36/-0) breezy/tests/per_workingtree/__init__.py (+36/-10) breezy/tests/per_workingtree/test_add.py (+23/-0) breezy/tests/per_workingtree/test_add_reference.py (+4/-0) breezy/tests/per_workingtree/test_basis_inventory.py (+73/-18) breezy/tests/per_workingtree/test_break_lock.py (+7/-0) breezy/tests/per_workingtree/test_canonical_path.py (+12/-0) breezy/tests/per_workingtree/test_check_state.py (+14/-0) breezy/tests/per_workingtree/test_commit.py (+60/-1) breezy/tests/per_workingtree/test_content_filters.py (+15/-1) breezy/tests/per_workingtree/test_eol_conversion.py (+34/-0) breezy/tests/per_workingtree/test_executable.py (+38/-1) breezy/tests/per_workingtree/test_get_file_mtime.py (+17/-0) breezy/tests/per_workingtree/test_is_ignored.py (+8/-0) breezy/tests/per_workingtree/test_locking.py (+10/-3) breezy/tests/per_workingtree/test_merge_from_branch.py (+25/-0) breezy/tests/per_workingtree/test_mkdir.py (+11/-0) breezy/tests/per_workingtree/test_move.py (+32/-0) breezy/tests/per_workingtree/test_nested_specifics.py (+13/-0) breezy/tests/per_workingtree/test_parents.py (+125/-0) breezy/tests/per_workingtree/test_paths2ids.py (+8/-0) breezy/tests/per_workingtree/test_pull.py (+8/-0) breezy/tests/per_workingtree/test_readonly.py (+6/-0) breezy/tests/per_workingtree/test_remove.py (+12/-2) breezy/tests/per_workingtree/test_rename_one.py (+33/-0) breezy/tests/per_workingtree/test_revision_tree.py (+19/-0) breezy/tests/per_workingtree/test_set_root_id.py (+11/-0) breezy/tests/per_workingtree/test_shelf_manager.py (+8/-0) breezy/tests/per_workingtree/test_smart_add.py (+81/-0) breezy/tests/per_workingtree/test_symlinks.py (+28/-0) breezy/tests/per_workingtree/test_transform.py (+178/-2) breezy/tests/per_workingtree/test_uncommit.py (+10/-0) breezy/tests/per_workingtree/test_unversion.py (+8/-0) breezy/tests/per_workingtree/test_views.py (+24/-0) breezy/tests/per_workingtree/test_walkdirs.py (+19/-0) breezy/tests/per_workingtree/test_workingtree.py (+299/-1) breezy/tests/scenarios.py (+8/-0) breezy/tests/script.py (+99/-0) breezy/tests/ssl_certs/__init__.py (+6/-0) breezy/tests/ssl_certs/create_ssls.py (+167/-0) breezy/tests/stub_sftp.py (+63/-0) breezy/tests/test__annotator.py (+50/-0) breezy/tests/test__chunks_to_lines.py.OTHER (+127/-0) breezy/tests/test__known_graph.py (+103/-0) breezy/tests/test__walkdirs_win32.py.OTHER (+121/-0) breezy/tests/test_annotate.py (+59/-0) breezy/tests/test_atomicfile.py (+7/-0) breezy/tests/test_bad_files.py (+18/-1) breezy/tests/test_bedding.py (+12/-0) breezy/tests/test_bisect.py (+38/-10) breezy/tests/test_branch.py (+112/-2) breezy/tests/test_branchbuilder.py (+60/-0) breezy/tests/test_bugtracker.py (+45/-0) breezy/tests/test_cache_utf8.py (+24/-0) breezy/tests/test_cethread.py (+7/-0) breezy/tests/test_clean_tree.py (+32/-0) breezy/tests/test_cmdline.py (+7/-0) breezy/tests/test_commands.py (+47/-0) breezy/tests/test_commit.py (+404/-54) breezy/tests/test_commit_merge.py (+21/-0) breezy/tests/test_config.py (+745/-3) breezy/tests/test_conflicts.py (+384/-1) breezy/tests/test_controldir.py (+9/-0) breezy/tests/test_counted_lock.py (+13/-0) breezy/tests/test_crash.py (+14/-0) breezy/tests/test_debug.py (+14/-0) breezy/tests/test_decorators.py (+11/-0) breezy/tests/test_delta.py (+72/-0) breezy/tests/test_diff.py (+139/-0) breezy/tests/test_directory_service.py (+18/-0) breezy/tests/test_dirty_tracker.py (+6/-0) breezy/tests/test_email_message.py (+72/-0) breezy/tests/test_eol_filters.py (+25/-0) breezy/tests/test_errors.py (+69/-0) breezy/tests/test_estimate_compressed_size.py (+28/-0) breezy/tests/test_export.py (+8/-0) breezy/tests/test_export_pot.py (+52/-5) breezy/tests/test_extract.py (+29/-0) breezy/tests/test_features.py (+11/-0) breezy/tests/test_fetch.py (+61/-2) breezy/tests/test_fifo_cache.py (+12/-0) breezy/tests/test_filter_tree.py (+11/-0) breezy/tests/test_filters.py (+4/-0) breezy/tests/test_fixtures.py (+13/-0) breezy/tests/test_foreign.py (+38/-1) breezy/tests/test_forge.py (+73/-24) breezy/tests/test_generate_docs.py (+5/-0) breezy/tests/test_globbing.py (+68/-0) breezy/tests/test_gpg.py (+15/-0) breezy/tests/test_graph.py (+182/-2) breezy/tests/test_grep.py (+1504/-2) breezy/tests/test_help.py (+81/-4) breezy/tests/test_hooks.py (+22/-0) breezy/tests/test_http.py (+410/-2) breezy/tests/test_http_response.py (+65/-2) breezy/tests/test_https_ca_bundle.py (+7/-0) breezy/tests/test_https_urllib.py (+5/-0) breezy/tests/test_i18n.py (+108/-4) breezy/tests/test_ignores.py (+17/-0) breezy/tests/test_import_tariff.py (+24/-0) breezy/tests/test_info.py (+73/-0) breezy/tests/test_lazy_import.py (+95/-0) breezy/tests/test_lazy_regex.py (+22/-0) breezy/tests/test_library_state.py (+4/-0) breezy/tests/test_location.py (+34/-0) breezy/tests/test_lock.py (+57/-0) breezy/tests/test_lockdir.py (+127/-1) breezy/tests/test_log.py (+233/-0) breezy/tests/test_lru_cache.py (+67/-0) breezy/tests/test_lsprof.py (+18/-0) breezy/tests/test_mail_client.py (+106/-0) breezy/tests/test_matchers.py (+32/-0) breezy/tests/test_merge.py (+142/-3) breezy/tests/test_merge_core.py (+119/-1) breezy/tests/test_merge_directive.py (+250/-5) breezy/tests/test_mergeable.py (+14/-0) breezy/tests/test_mergetools.py (+6/-0) breezy/tests/test_missing.py (+26/-0) breezy/tests/test_msgeditor.py (+114/-1) breezy/tests/test_multiparent.py (+41/-0) breezy/tests/test_multiwalker.py (+11/-0) breezy/tests/test_mutabletree.py (+12/-0) breezy/tests/test_nonascii.py (+59/-0) breezy/tests/test_options.py (+15/-0) breezy/tests/test_osutils.py (+906/-62) breezy/tests/test_osutils_encodings.py (+76/-5) breezy/tests/test_patch.py (+7/-0) breezy/tests/test_patches.py (+88/-1) breezy/tests/test_patches_data/diff (+1/-1) breezy/tests/test_patches_data/diff-6 (+1/-1) breezy/tests/test_patches_data/mod (+15/-15) breezy/tests/test_patches_data/mod-2 (+1/-1) breezy/tests/test_patches_data/mod-3 (+1/-1) breezy/tests/test_patches_data/mod-4 (+1/-1) breezy/tests/test_patches_data/mod-5 (+1/-1) breezy/tests/test_patches_data/orig (+16/-16) breezy/tests/test_patches_data/orig-2 (+1/-1) breezy/tests/test_patches_data/orig-3 (+1/-1) breezy/tests/test_patches_data/orig-4 (+1/-1) breezy/tests/test_patches_data/orig-5 (+1/-1) breezy/tests/test_patches_data/orig-6 (+1/-1) breezy/tests/test_plugins.py (+183/-5) breezy/tests/test_progress.py (+16/-0) breezy/tests/test_pyutils.py (+11/-0) breezy/tests/test_reconcile.py (+11/-0) breezy/tests/test_reconfigure.py (+16/-0) breezy/tests/test_registry.py (+68/-0) breezy/tests/test_revert.py (+10/-0) breezy/tests/test_revision.py (+117/-13) breezy/tests/test_revisionspec.py (+56/-0) breezy/tests/test_revisiontree.py (+14/-0) breezy/tests/test_rules.py (+7/-0) breezy/tests/test_scenarios.py (+32/-1) breezy/tests/test_script.py (+100/-2) breezy/tests/test_selftest.py (+345/-8) breezy/tests/test_server.py (+65/-2) breezy/tests/test_setup.py (+78/-0) breezy/tests/test_sftp_transport.py (+67/-0) breezy/tests/test_shelf.py (+98/-0) breezy/tests/test_shelf_ui.py (+30/-0) breezy/tests/test_smart_add.py (+17/-0) breezy/tests/test_smtp_connection.py (+10/-0) breezy/tests/test_source.py (+115/-6) breezy/tests/test_ssh_transport.py (+14/-0) breezy/tests/test_status.py (+67/-0) breezy/tests/test_strace.py (+17/-0) breezy/tests/test_switch.py (+11/-0) breezy/tests/test_symbol_versioning.py (+35/-0) breezy/tests/test_tag.py (+26/-0) breezy/tests/test_test_server.py (+25/-0) breezy/tests/test_timestamp.py (+168/-0) breezy/tests/test_trace.py (+76/-0) breezy/tests/test_transactions.py (+1/-1) breezy/tests/test_transform.py (+95/-0) breezy/tests/test_transport.py (+147/-1) breezy/tests/test_tree.py (+12/-0) breezy/tests/test_treebuilder.py (+8/-0) breezy/tests/test_treeshape.py (+20/-0) breezy/tests/test_tsort.py (+46/-1) breezy/tests/test_ui.py (+76/-0) breezy/tests/test_uncommit.py (+8/-0) breezy/tests/test_upgrade.py (+22/-0) breezy/tests/test_upgrade_stacked.py (+24/-0) breezy/tests/test_upstream_import.py (+29/-0) breezy/tests/test_url_policy_open.py (+39/-0) breezy/tests/test_urlutils.py (+121/-5) breezy/tests/test_utextwrap.py (+108/-0) breezy/tests/test_version.py (+22/-0) breezy/tests/test_version_info.py (+79/-0) breezy/tests/test_views.py (+9/-0) breezy/tests/test_whitebox.py (+10/-0) breezy/tests/test_win32utils.py (+29/-2) breezy/tests/test_workingtree.py (+50/-0) breezy/tests/test_workspace.py (+28/-0) breezy/tests/test_wsgi.py (+22/-0) breezy/tests/testui.py (+9/-0) breezy/tests/treeshape.py (+6/-0) breezy/textfile.py (+20/-0) breezy/timestamp.py.OTHER (+163/-0) breezy/trace.py (+284/-1) breezy/transactions.py (+7/-0) breezy/transform.py (+87/-0) breezy/transport/__init__.py (+321/-4) breezy/transport/brokenrename.py (+11/-0) breezy/transport/chroot.py (+7/-0) breezy/transport/decorator.py (+7/-0) breezy/transport/fakenfs.py (+13/-0) breezy/transport/fakevfat.py (+10/-0) breezy/transport/gio_transport.py (+207/-2) breezy/transport/http/__init__.py (+18/-0) breezy/transport/http/response.py (+79/-1) breezy/transport/http/urllib.py (+416/-8) breezy/transport/http/wsgi.py (+1/-1) breezy/transport/local.py (+554/-0) breezy/transport/log.py (+21/-0) breezy/transport/memory.py (+57/-1) breezy/transport/pathfilter.py (+19/-0) breezy/transport/readonly.py (+5/-0) breezy/transport/remote.py (+89/-3) breezy/transport/sftp.py (+283/-1) breezy/transport/ssh/__init__.py (+309/-3) breezy/transport/trace.py (+6/-1) breezy/transport/unlistable.py (+5/-0) breezy/tree.py (+58/-1) breezy/treebuilder.py (+72/-0) breezy/tsort.py (+675/-0) breezy/ui/__init__.py (+90/-3) breezy/ui/text.py (+72/-0) breezy/uncommit.py (+41/-0) breezy/upgrade.py (+17/-0) breezy/upstream_import.py (+34/-0) breezy/url_policy_open.py (+20/-1) breezy/urlutils.py (+700/-6) breezy/utextwrap.py (+1/-1) breezy/util/simplemapi.py (+7/-0) breezy/version.py (+19/-0) breezy/version_info_formats/__init__.py (+77/-2) breezy/version_info_formats/format_custom.py (+23/-0) breezy/version_info_formats/format_python.py (+38/-8) breezy/version_info_formats/format_rio.py (+36/-0) breezy/version_info_formats/format_yaml.py (+17/-0) breezy/views.py (+35/-0) breezy/win32utils.py (+49/-3) breezy/workingtree.py (+167/-1) contrib/brz_access (+2/-2) contrib/emacs/brz-mode.el (+1/-1) crates/bazaar-py/src/rio.rs (+6/-0) doc/developers/HACKING.txt (+3/-3) doc/developers/authentication-ring.txt (+3/-3) doc/developers/btree_index_prefetch.txt (+1/-1) doc/developers/bug-handling.txt (+1/-1) doc/developers/code-style.txt (+1/-1) doc/developers/conf.py (+7/-0) doc/developers/development-repo.txt (+2/-2) doc/developers/ec2.txt (+4/-4) doc/developers/groupcompress-design.txt (+3/-3) doc/developers/improved_chk_index.txt (+1/-1) doc/developers/inventory.txt (+5/-5) doc/developers/network-protocol.txt (+2/-2) doc/developers/overview.txt (+1/-1) doc/developers/performance-roadmap-rationale.txt (+1/-1) doc/developers/plans/nested-trees.txt (+4/-4) doc/developers/plans/performance/bundle-creation.txt (+1/-1) doc/developers/plans/performance/diff.txt (+4/-4) doc/developers/plans/performance/incremental-push-pull.txt (+6/-6) doc/developers/plans/performance/initial-push-pull.txt (+1/-1) doc/developers/plans/performance/merge-scaling.txt (+1/-1) doc/developers/plans/performance/planned-performance-changes.txt (+3/-3) doc/developers/plans/performance/status.txt (+1/-1) doc/developers/plans/tortoise-strategy.txt (+1/-1) doc/developers/plugin-api.txt (+1/-1) doc/developers/plugin-development.txt (+2/-2) doc/developers/ppa.txt (+2/-2) doc/developers/profiling.txt (+1/-1) doc/developers/releasing.txt (+3/-3) doc/developers/repository.txt (+3/-3) doc/developers/testing.txt (+3/-3) doc/developers/win32_build_setup.txt (+1/-1) doc/en/admin-guide/backup.txt (+1/-1) doc/en/admin-guide/security.txt (+2/-2) doc/en/admin-guide/simple-setups.txt (+2/-2) doc/en/conf.py (+94/-0) doc/en/release-notes/brz-3.0.txt (+3/-3) doc/en/release-notes/bzr-0.1.txt (+3/-3) doc/en/release-notes/bzr-0.11.txt (+1/-1) doc/en/release-notes/bzr-0.12.txt (+1/-1) doc/en/release-notes/bzr-0.15.txt (+3/-3) doc/en/release-notes/bzr-0.16.txt (+1/-1) doc/en/release-notes/bzr-0.17.txt (+1/-1) doc/en/release-notes/bzr-0.6.txt (+1/-1) doc/en/release-notes/bzr-0.7.txt (+1/-1) doc/en/release-notes/bzr-0.8.txt (+3/-3) doc/en/release-notes/bzr-0.90.txt (+2/-2) doc/en/release-notes/bzr-0.91.txt (+2/-2) doc/en/release-notes/bzr-0.92.txt (+1/-1) doc/en/release-notes/bzr-1.0.txt (+3/-3) doc/en/release-notes/bzr-1.1.txt (+1/-1) doc/en/release-notes/bzr-1.12.txt (+1/-1) doc/en/release-notes/bzr-1.14.txt (+1/-1) doc/en/release-notes/bzr-1.18.txt (+1/-1) doc/en/release-notes/bzr-1.3.txt (+1/-1) doc/en/release-notes/bzr-1.4.txt (+1/-1) doc/en/release-notes/bzr-1.6.txt (+7/-7) doc/en/release-notes/bzr-1.9.txt (+1/-1) doc/en/release-notes/bzr-2.0.txt (+3/-3) doc/en/release-notes/bzr-2.1.txt (+5/-5) doc/en/release-notes/bzr-2.2.txt (+31/-31) doc/en/release-notes/bzr-2.3.txt (+8/-8) doc/en/release-notes/bzr-2.4.txt (+1/-1) doc/en/release-notes/bzr-2.5.txt (+2/-2) doc/en/release-notes/bzr-2.6.txt (+1/-1) doc/en/tutorials/tutorial.txt (+2/-2) doc/en/user-guide/gpg_signatures.txt (+1/-1) doc/en/user-guide/recording_changes.txt (+1/-1) doc/en/user-guide/shared_repository_layouts.txt (+1/-1) doc/en/user-guide/undoing_mistakes.txt (+1/-1) doc/en/whats-new/whats-new-in-2.2.txt (+6/-6) doc/en/whats-new/whats-new-in-2.5.txt (+1/-1) doc/news-template.txt (+1/-1) profile_imports.py (+10/-0) setup.py (+111/-23) tools/brzflakes.py (+5/-0) tools/capture_tree.py (+7/-0) tools/check-newsbugs.py (+27/-3) tools/fixed-in.py (+26/-0) tools/flake8_lazy_import.py (+8/-2) tools/generate_docs.py (+23/-1) tools/generate_release_notes.py (+10/-0) tools/package_docs.py (+9/-0) tools/package_mf.py (+9/-2) tools/prepare_for_latex.py (+1/-1) tools/rst2html.py (+19/-0) tools/rst2pdf.py (+19/-0) tools/rst2prettyhtml.py (+40/-0) tools/time_graph.py (+65/-1) tools/win32/bootstrap.py (+38/-0) tools/win32/brz-win32-bdist-postinstall.py (+17/-2) tools/win32/brz_postinstall.py (+62/-7) tools/win32/build_release.py (+99/-0) tools/win32/file_version.py (+18/-4) tools/win32/run_script.py (+4/-0) xfail.macos (+1/-1) Text conflict in apport/source_brz.py Text conflict in breezy/__init__.py Text conflict in breezy/__main__.py Text conflict in breezy/_annotator_py.py Contents conflict in breezy/_chunks_to_lines_py.py Text conflict in breezy/_known_graph_py.py Contents conflict in breezy/_readdir_py.py Contents conflict in breezy/_termcolor.py Contents conflict in breezy/_walkdirs_win32.pyx Text conflict in breezy/add.py Text conflict in breezy/annotate.py Text conflict in breezy/archive/__init__.py Text conflict in breezy/archive/tar.py Text conflict in breezy/archive/zip.py Text conflict in breezy/atomicfile.py Text conflict in breezy/bedding.py Text conflict in breezy/bisect.py Text conflict in breezy/branch.py Text conflict in breezy/branchbuilder.py Text conflict in breezy/breakin.py Text conflict in breezy/bugtracker.py Text conflict in breezy/builtins.py Text conflict in breezy/bzr/__init__.py Text conflict in breezy/bzr/_chk_map_py.py Text conflict in breezy/bzr/_dirstate_helpers_py.py Contents conflict in breezy/bzr/_groupcompress_py.py Text conflict in breezy/bzr/_knit_load_data_py.py Contents conflict in breezy/bzr/_rio_py.py Text conflict in breezy/bzr/_static_tuple_py.py Text conflict in breezy/bzr/branch.py Text conflict in breezy/bzr/btree_index.py Text conflict in breezy/bzr/bundle/bundle_data.py Text conflict in breezy/bzr/bundle/commands.py Text conflict in breezy/bzr/bundle/serializer/__init__.py Text conflict in breezy/bzr/bundle/serializer/v08.py Text conflict in breezy/bzr/bundle/serializer/v4.py Text conflict in breezy/bzr/bzrdir.py Text conflict in breezy/bzr/check.py Text conflict in breezy/bzr/chk_map.py Text conflict in breezy/bzr/chk_serializer.py Text conflict in breezy/bzr/conflicts.py Text conflict in breezy/bzr/debug_commands.py Text conflict in breezy/bzr/dirstate.py Text conflict in breezy/bzr/fetch.py Text conflict in breezy/bzr/fullhistory.py Text conflict in breezy/bzr/generate_ids.py Text conflict in breezy/bzr/groupcompress.py Text conflict in breezy/bzr/groupcompress_repo.py Contents conflict in breezy/bzr/hashcache.py Text conflict in breezy/bzr/index.py Text conflict in breezy/bzr/inventory.py Text conflict in breezy/bzr/inventory_delta.py Text conflict in breezy/bzr/inventorytree.py Text conflict in breezy/bzr/knit.py Text conflict in breezy/bzr/knitpack_repo.py Text conflict in breezy/bzr/knitrepo.py Text conflict in breezy/bzr/lockable_files.py Text conflict in breezy/bzr/pack.py Text conflict in breezy/bzr/pack_repo.py Text conflict in breezy/bzr/reconcile.py Text conflict in breezy/bzr/remote.py Text conflict in breezy/bzr/repository.py Contents conflict in breezy/bzr/rio.py Text conflict in breezy/bzr/serializer.py Text conflict in breezy/bzr/smart/branch.py Text conflict in breezy/bzr/smart/bzrdir.py Text conflict in breezy/bzr/smart/client.py Text conflict in breezy/bzr/smart/medium.py Text conflict in breezy/bzr/smart/message.py Text conflict in breezy/bzr/smart/packrepository.py Text conflict in breezy/bzr/smart/ping.py Text conflict in breezy/bzr/smart/protocol.py Text conflict in breezy/bzr/smart/repository.py Text conflict in breezy/bzr/smart/request.py Text conflict in breezy/bzr/smart/server.py Text conflict in breezy/bzr/static_tuple.py Text conflict in breezy/bzr/tag.py Text conflict in breezy/bzr/testament.py Text conflict in breezy/bzr/tests/__init__.py Text conflict in breezy/bzr/tests/blackbox/__init__.py Text conflict in breezy/bzr/tests/blackbox/test_dump_btree.py Text conflict in breezy/bzr/tests/matchers.py Text conflict in breezy/bzr/tests/per_bzrdir/__init__.py Text conflict in breezy/bzr/tests/per_bzrdir/test_bzrdir.py Text conflict in breezy/bzr/tests/per_inventory/__init__.py Text conflict in breezy/bzr/tests/per_inventory/basics.py Text conflict in breezy/bzr/tests/per_pack_repository.py Text conflict in breezy/bzr/tests/per_repository_chk/__init__.py Text conflict in breezy/bzr/tests/per_repository_chk/test_supported.py Text conflict in breezy/bzr/tests/per_repository_vf/__init__.py Text conflict in breezy/bzr/tests/per_repository_vf/helpers.py Text conflict in breezy/bzr/tests/per_repository_vf/test__generate_text_key_index.py Text conflict in breezy/bzr/tests/per_repository_vf/test_add_inventory_by_delta.py Text conflict in breezy/bzr/tests/per_repository_vf/test_check.py Text conflict in breezy/bzr/tests/per_repository_vf/test_check_reconcile.py Text conflict in breezy/bzr/tests/per_repository_vf/test_fetch.py Text conflict in breezy/bzr/tests/per_repository_vf/test_fileid_involved.py Text conflict in breezy/bzr/tests/per_repository_vf/test_find_text_key_references.py Text conflict in breezy/bzr/tests/per_repository_vf/test_merge_directive.py Text conflict in breezy/bzr/tests/per_repository_vf/test_reconcile.py Text conflict in breezy/bzr/tests/per_repository_vf/test_refresh_data.py Text conflict in breezy/bzr/tests/per_repository_vf/test_repository.py Text conflict in breezy/bzr/tests/per_repository_vf/test_write_group.py Text conflict in breezy/bzr/tests/per_versionedfile.py Text conflict in breezy/bzr/tests/test__btree_serializer.py Text conflict in breezy/bzr/tests/test__chk_map.py Text conflict in breezy/bzr/tests/test__dirstate_helpers.py Text conflict in breezy/bzr/tests/test__groupcompress.py Contents conflict in breezy/bzr/tests/test__rio.py Text conflict in breezy/bzr/tests/test__simple_set.py Text conflict in breezy/bzr/tests/test__static_tuple.py Text conflict in breezy/bzr/tests/test_btree_index.py Text conflict in breezy/bzr/tests/test_bundle.py Text conflict in breezy/bzr/tests/test_bzrdir.py Text conflict in breezy/bzr/tests/test_chk_map.py Text conflict in breezy/bzr/tests/test_chk_serializer.py Text conflict in breezy/bzr/tests/test_conflicts.py Text conflict in breezy/bzr/tests/test_dirstate.py Text conflict in breezy/bzr/tests/test_generate_ids.py Text conflict in breezy/bzr/tests/test_groupcompress.py Text conflict in breezy/bzr/tests/test_hashcache.py Text conflict in breezy/bzr/tests/test_index.py Text conflict in breezy/bzr/tests/test_inv.py Text conflict in breezy/bzr/tests/test_inventory_delta.py Text conflict in breezy/bzr/tests/test_knit.py Text conflict in breezy/bzr/tests/test_lockable_files.py Text conflict in breezy/bzr/tests/test_matchers.py Text conflict in breezy/bzr/tests/test_pack.py Text conflict in breezy/bzr/tests/test_remote.py Text conflict in breezy/bzr/tests/test_repository.py Text conflict in breezy/bzr/tests/test_rio.py Text conflict in breezy/bzr/tests/test_serializer.py Text conflict in breezy/bzr/tests/test_smart.py Text conflict in breezy/bzr/tests/test_smart_request.py Text conflict in breezy/bzr/tests/test_smart_transport.py Text conflict in breezy/bzr/tests/test_tag.py Text conflict in breezy/bzr/tests/test_testament.py Text conflict in breezy/bzr/tests/test_transform.py Text conflict in breezy/bzr/tests/test_tuned_gzip.py Text conflict in breezy/bzr/tests/test_versionedfile.py Text conflict in breezy/bzr/tests/test_vf_search.py Text conflict in breezy/bzr/tests/test_vfs_ratchet.py Text conflict in breezy/bzr/tests/test_weave.py Text conflict in breezy/bzr/tests/test_workingtree_4.py Text conflict in breezy/bzr/tests/test_xml.py Contents conflict in breezy/bzr/textinv.py Text conflict in breezy/bzr/transform.py Text conflict in breezy/bzr/versionedfile.py Text conflict in breezy/bzr/vf_repository.py Text conflict in breezy/bzr/vf_search.py Text conflict in breezy/bzr/weave.py Text conflict in breezy/bzr/weavefile.py Text conflict in breezy/bzr/workingtree.py Text conflict in breezy/bzr/workingtree_3.py Text conflict in breezy/bzr/workingtree_4.py Text conflict in breezy/bzr/xml5.py Text conflict in breezy/bzr/xml6.py Text conflict in breezy/bzr/xml7.py Text conflict in breezy/bzr/xml8.py Text conflict in breezy/bzr/xml_serializer.py Contents conflict in breezy/bzr_distutils.py Text conflict in breezy/cache_utf8.py Text conflict in breezy/check.py Text conflict in breezy/clean_tree.py Text conflict in breezy/cmd_test_script.py Text conflict in breezy/cmd_version_info.py Text conflict in breezy/cmdline.py Text conflict in breezy/colordiff.py Text conflict in breezy/commands.py Text conflict in breezy/commit.py Text conflict in breezy/commit_signature_commands.py Text conflict in breezy/config.py Text conflict in breezy/conflicts.py Text conflict in breezy/controldir.py Text conflict in breezy/counted_lock.py Text conflict in breezy/crash.py Text conflict in breezy/debug.py Text conflict in breezy/decorators.py Text conflict in breezy/delta.py Text conflict in breezy/diff.py Text conflict in breezy/directory_service.py Text conflict in breezy/doc/api/__init__.py Text conflict in breezy/doc_generate/autodoc_man.py Text conflict in breezy/doc_generate/autodoc_rstx.py Text conflict in breezy/email_message.py Text conflict in breezy/errors.py Contents conflict in breezy/estimate_compressed_size.py Text conflict in breezy/export.py Text conflict in breezy/export_pot.py Text conflict in breezy/externalcommand.py Text conflict in breezy/fifo_cache.py Text conflict in breezy/filter_tree.py Text conflict in breezy/filters/__init__.py Text conflict in breezy/foreign.py Text conflict in breezy/forge.py Text conflict in breezy/git/__init__.py Text conflict in breezy/git/annotate.py Text conflict in breezy/git/branch.py Text conflict in breezy/git/cache.py Text conflict in breezy/git/commands.py Text conflict in breezy/git/commit.py Text conflict in breezy/git/config.py Text conflict in breezy/git/dir.py Text conflict in breezy/git/fetch.py Text conflict in breezy/git/filegraph.py Text conflict in breezy/git/git_remote_helper.py Text conflict in breezy/git/interrepo.py Text conflict in breezy/git/mapping.py Text conflict in breezy/git/memorytree.py Text conflict in breezy/git/object_store.py Text conflict in breezy/git/pristine_tar.py Text conflict in breezy/git/push.py Text conflict in breezy/git/refs.py Text conflict in breezy/git/remote.py Text conflict in breezy/git/repository.py Text conflict in breezy/git/revspec.py Text conflict in breezy/git/roundtrip.py Text conflict in breezy/git/send.py Text conflict in breezy/git/server.py Text conflict in breezy/git/tests/__init__.py Text conflict in breezy/git/tests/test_blackbox.py Text conflict in breezy/git/tests/test_branch.py Text conflict in breezy/git/tests/test_builder.py Text conflict in breezy/git/tests/test_cache.py Text conflict in breezy/git/tests/test_dir.py Text conflict in breezy/git/tests/test_fetch.py Text conflict in breezy/git/tests/test_git_remote_helper.py Text conflict in breezy/git/tests/test_mapping.py Text conflict in breezy/git/tests/test_object_store.py Text conflict in breezy/git/tests/test_pristine_tar.py Text conflict in breezy/git/tests/test_push.py Text conflict in breezy/git/tests/test_refs.py Text conflict in breezy/git/tests/test_remote.py Text conflict in breezy/git/tests/test_repository.py Text conflict in breezy/git/tests/test_revspec.py Text conflict in breezy/git/tests/test_server.py Text conflict in breezy/git/tests/test_transportgit.py Text conflict in breezy/git/tests/test_tree.py Text conflict in breezy/git/tests/test_unpeel_map.py Text conflict in breezy/git/tests/test_urls.py Text conflict in breezy/git/tests/test_workingtree.py Text conflict in breezy/git/transform.py Text conflict in breezy/git/transportgit.py Text conflict in breezy/git/tree.py Text conflict in breezy/git/unpeel_map.py Text conflict in breezy/git/urls.py Text conflict in breezy/git/workingtree.py Text conflict in breezy/globbing.py Text conflict in breezy/gpg.py Text conflict in breezy/graph.py Text conflict in breezy/grep.py Text conflict in breezy/help.py Text conflict in breezy/help_topics/__init__.py Text conflict in breezy/hooks.py Text conflict in breezy/i18n.py Text conflict in breezy/identitymap.py Text conflict in breezy/ignores.py Text conflict in breezy/info.py Contents conflict in breezy/iterablefile.py Text conflict in breezy/lazy_import.py Text conflict in breezy/lazy_regex.py Text conflict in breezy/location.py Text conflict in breezy/lock.py Text conflict in breezy/lockdir.py Text conflict in breezy/log.py Text conflict in breezy/lru_cache.py Text conflict in breezy/lsprof.py Text conflict in breezy/mail_client.py Text conflict in breezy/memorybranch.py Text conflict in breezy/memorytree.py Text conflict in breezy/merge.py Text conflict in breezy/merge_directive.py Text conflict in breezy/mergeable.py Text conflict in breezy/mergetools.py Text conflict in breezy/missing.py Text conflict in breezy/msgeditor.py Text conflict in breezy/multiparent.py Text conflict in breezy/multiwalker.py Text conflict in breezy/mutabletree.py Text conflict in breezy/option.py Text conflict in breezy/osutils.py Text conflict in breezy/patch.py Text conflict in breezy/patches.py Text conflict in breezy/plugin.py Text conflict in breezy/plugins/bash_completion/__init__.py Text conflict in breezy/plugins/bash_completion/bashcomp.py Text conflict in breezy/plugins/bash_completion/tests/__init__.py Text conflict in breezy/plugins/bash_completion/tests/test_bashcomp.py Text conflict in breezy/plugins/changelog_merge/__init__.py Text conflict in breezy/plugins/changelog_merge/changelog_merge.py Text conflict in breezy/plugins/changelog_merge/tests/__init__.py Text conflict in breezy/plugins/changelog_merge/tests/test_changelog_merge.py Text conflict in breezy/plugins/commitfromnews/__init__.py Text conflict in breezy/plugins/commitfromnews/tests/__init__.py Text conflict in breezy/plugins/commitfromnews/tests/test_committemplate.py Text conflict in breezy/plugins/cvs/__init__.py Text conflict in breezy/plugins/darcs/__init__.py Text conflict in breezy/plugins/email/emailer.py Text conflict in breezy/plugins/email/tests/testemail.py Text conflict in breezy/plugins/fastimport/__init__.py Text conflict in breezy/plugins/fastimport/branch_mapper.py Text conflict in breezy/plugins/fastimport/branch_updater.py Text conflict in breezy/plugins/fastimport/bzr_commit_handler.py Text conflict in breezy/plugins/fastimport/cache_manager.py Text conflict in breezy/plugins/fastimport/cmds.py Text conflict in breezy/plugins/fastimport/exporter.py Text conflict in breezy/plugins/fastimport/helpers.py Text conflict in breezy/plugins/fastimport/processors/generic_processor.py Text conflict in breezy/plugins/fastimport/revision_store.py Text conflict in breezy/plugins/fastimport/tests/test_branch_mapper.py Text conflict in breezy/plugins/fastimport/tests/test_commands.py Text conflict in breezy/plugins/fastimport/tests/test_exporter.py Text conflict in breezy/plugins/fastimport/tests/test_generic_processor.py Text conflict in breezy/plugins/fastimport/tests/test_head_tracking.py Text conflict in breezy/plugins/fastimport/tests/test_revision_store.py Conflict adding files to breezy/plugins/flake8. Created directory. Conflict because breezy/plugins/flake8 is not versioned, but has versioned children. Versioned directory. Contents conflict in breezy/plugins/flake8/__init__.py Text conflict in breezy/plugins/fossil/__init__.py Text conflict in breezy/plugins/github/cmds.py Text conflict in breezy/plugins/github/forge.py Text conflict in breezy/plugins/gitlab/cmds.py Text conflict in breezy/plugins/gitlab/forge.py Text conflict in breezy/plugins/gitlab/tests/test_forge.py Text conflict in breezy/plugins/hg/__init__.py Text conflict in breezy/plugins/launchpad/__init__.py Text conflict in breezy/plugins/launchpad/account.py Text conflict in breezy/plugins/launchpad/cmds.py Text conflict in breezy/plugins/launchpad/forge.py Text conflict in breezy/plugins/launchpad/lp_api.py Text conflict in breezy/plugins/launchpad/lp_directory.py Text conflict in breezy/plugins/launchpad/test_lp_api.py Text conflict in breezy/plugins/launchpad/test_lp_directory.py Text conflict in breezy/plugins/launchpad/uris.py Text conflict in breezy/plugins/mtn/__init__.py Text conflict in breezy/plugins/netrc_credential_store/__init__.py Text conflict in breezy/plugins/netrc_credential_store/tests/__init__.py Text conflict in breezy/plugins/netrc_credential_store/tests/test_netrc.py Text conflict in breezy/plugins/news_merge/tests/test_news_merge.py Text conflict in breezy/plugins/po_merge/__init__.py Text conflict in breezy/plugins/po_merge/po_merge.py Text conflict in breezy/plugins/po_merge/tests/__init__.py Text conflict in breezy/plugins/po_merge/tests/test_po_merge.py Text conflict in breezy/plugins/propose/cmds.py Text conflict in breezy/plugins/pypi/__init__.py Text conflict in breezy/plugins/pypi/directory.py Text conflict in breezy/plugins/quilt/__init__.py Text conflict in breezy/plugins/quilt/merge.py Text conflict in breezy/plugins/quilt/tests/__init__.py Text conflict in breezy/plugins/quilt/tests/test_merge.py Text conflict in breezy/plugins/quilt/tests/test_wrapper.py Text conflict in breezy/plugins/quilt/wrapper.py Text conflict in breezy/plugins/repodebug/check_chk.py Text conflict in breezy/plugins/repodebug/chk_used_by.py Text conflict in breezy/plugins/repodebug/fetch_all_records.py Text conflict in breezy/plugins/repodebug/file_refs.py Text conflict in breezy/plugins/repodebug/missing_keys_for_stacking_fixer.py Text conflict in breezy/plugins/rewrite/__init__.py Text conflict in breezy/plugins/rewrite/commands.py Text conflict in breezy/plugins/rewrite/maptree.py Text conflict in breezy/plugins/rewrite/pseudonyms.py Text conflict in breezy/plugins/rewrite/rebase.py Text conflict in breezy/plugins/rewrite/tests/__init__.py Text conflict in breezy/plugins/rewrite/tests/test_maptree.py Text conflict in breezy/plugins/rewrite/tests/test_pseudonyms.py Text conflict in breezy/plugins/rewrite/tests/test_rebase.py Text conflict in breezy/plugins/rewrite/tests/test_upgrade.py Text conflict in breezy/plugins/rewrite/upgrade.py Text conflict in breezy/plugins/stats/cmds.py Text conflict in breezy/plugins/stats/test_stats.py Text conflict in breezy/plugins/svn/__init__.py Text conflict in breezy/plugins/svn/revspec.py Text conflict in breezy/plugins/upload/__init__.py Text conflict in breezy/plugins/upload/cmds.py Text conflict in breezy/plugins/upload/tests/__init__.py Text conflict in breezy/plugins/upload/tests/test_auto_upload_hook.py Text conflict in breezy/plugins/upload/tests/test_upload.py Text conflict in breezy/plugins/weave_fmt/__init__.py Text conflict in breezy/plugins/weave_fmt/branch.py Text conflict in breezy/plugins/weave_fmt/bzrdir.py Text conflict in breezy/plugins/weave_fmt/repository.py Text conflict in breezy/plugins/weave_fmt/store/__init__.py Text conflict in breezy/plugins/weave_fmt/store/versioned.py Text conflict in breezy/plugins/weave_fmt/test_bzrdir.py Text conflict in breezy/plugins/weave_fmt/test_repository.py Text conflict in breezy/plugins/weave_fmt/test_store.py Text conflict in breezy/plugins/weave_fmt/test_workingtree.py Text conflict in breezy/plugins/weave_fmt/workingtree.py Text conflict in breezy/plugins/weave_fmt/xml4.py Text conflict in breezy/plugins/webdav/__init__.py Text conflict in breezy/plugins/webdav/tests/__init__.py Text conflict in breezy/plugins/webdav/tests/dav_server.py Text conflict in breezy/plugins/webdav/tests/test_webdav.py Text conflict in breezy/plugins/webdav/webdav.py Text conflict in breezy/plugins/zsh_completion/__init__.py Text conflict in breezy/plugins/zsh_completion/tests/__init__.py Text conflict in breezy/plugins/zsh_completion/zshcomp.py Text conflict in breezy/progress.py Text conflict in breezy/push.py Text conflict in breezy/pyutils.py Text conflict in breezy/reconcile.py Text conflict in breezy/reconfigure.py Text conflict in breezy/registry.py Text conflict in breezy/rename_map.py Text conflict in breezy/repository.py Text conflict in breezy/revision.py Text conflict in breezy/revisionspec.py Text conflict in breezy/revisiontree.py Text conflict in breezy/rules.py Text conflict in breezy/send.py Text conflict in breezy/shelf.py Text conflict in breezy/shelf_ui.py Text conflict in breezy/shellcomplete.py Text conflict in breezy/smtp_connection.py Text conflict in breezy/status.py Text conflict in breezy/switch.py Text conflict in breezy/symbol_versioning.py Text conflict in breezy/tag.py Text conflict in breezy/terminal.py Text conflict in breezy/tests/TestUtil.py Text conflict in breezy/tests/__init__.py Text conflict in breezy/tests/blackbox/test_add.py Text conflict in breezy/tests/blackbox/test_added.py Text conflict in breezy/tests/blackbox/test_alias.py Text conflict in breezy/tests/blackbox/test_aliases.py Text conflict in breezy/tests/blackbox/test_annotate.py Text conflict in breezy/tests/blackbox/test_big_file.py Text conflict in breezy/tests/blackbox/test_bisect.py Text conflict in breezy/tests/blackbox/test_bound_branches.py Text conflict in breezy/tests/blackbox/test_branch.py Text conflict in breezy/tests/blackbox/test_break_lock.py Text conflict in breezy/tests/blackbox/test_bundle_info.py Text conflict in breezy/tests/blackbox/test_cat.py Text conflict in breezy/tests/blackbox/test_cat_revision.py Text conflict in breezy/tests/blackbox/test_check.py Text conflict in breezy/tests/blackbox/test_checkout.py Text conflict in breezy/tests/blackbox/test_clean_tree.py Text conflict in breezy/tests/blackbox/test_clone.py Text conflict in breezy/tests/blackbox/test_commit.py Text conflict in breezy/tests/blackbox/test_config.py Text conflict in breezy/tests/blackbox/test_conflicts.py Text conflict in breezy/tests/blackbox/test_cp.py Text conflict in breezy/tests/blackbox/test_debug.py Text conflict in breezy/tests/blackbox/test_deleted.py Text conflict in breezy/tests/blackbox/test_diff.py Text conflict in breezy/tests/blackbox/test_exceptions.py Text conflict in breezy/tests/blackbox/test_export.py Text conflict in breezy/tests/blackbox/test_export_pot.py Text conflict in breezy/tests/blackbox/test_filesystem_cicp.py Text conflict in breezy/tests/blackbox/test_filtered_view_ops.py Text conflict in breezy/tests/blackbox/test_find_merge_base.py Text conflict in breezy/tests/blackbox/test_help.py Text conflict in breezy/tests/blackbox/test_ignore.py Text conflict in breezy/tests/blackbox/test_ignored.py Text conflict in breezy/tests/blackbox/test_import.py Text conflict in breezy/tests/blackbox/test_info.py Text conflict in breezy/tests/blackbox/test_init.py Text conflict in breezy/tests/blackbox/test_inventory.py Text conflict in breezy/tests/blackbox/test_join.py Text conflict in breezy/tests/blackbox/test_link_tree.py Text conflict in breezy/tests/blackbox/test_locale.py Text conflict in breezy/tests/blackbox/test_log.py Text conflict in breezy/tests/blackbox/test_logformats.py Text conflict in breezy/tests/blackbox/test_lookup_revision.py Text conflict in breezy/tests/blackbox/test_ls.py Text conflict in breezy/tests/blackbox/test_merge.py Text conflict in breezy/tests/blackbox/test_merge_directive.py Text conflict in breezy/tests/blackbox/test_missing.py Text conflict in breezy/tests/blackbox/test_modified.py Text conflict in breezy/tests/blackbox/test_mv.py Text conflict in breezy/tests/blackbox/test_nick.py Text conflict in breezy/tests/blackbox/test_non_ascii.py Text conflict in breezy/tests/blackbox/test_outside_wt.py Text conflict in breezy/tests/blackbox/test_pack.py Text conflict in breezy/tests/blackbox/test_patch.py Text conflict in breezy/tests/blackbox/test_ping.py Text conflict in breezy/tests/blackbox/test_plugins.py Text conflict in breezy/tests/blackbox/test_pull.py Text conflict in breezy/tests/blackbox/test_push.py Text conflict in breezy/tests/blackbox/test_re_sign.py Text conflict in breezy/tests/blackbox/test_reconcile.py Text conflict in breezy/tests/blackbox/test_reconfigure.py Text conflict in breezy/tests/blackbox/test_reference.py Text conflict in breezy/tests/blackbox/test_remember_option.py Text conflict in breezy/tests/blackbox/test_remerge.py Text conflict in breezy/tests/blackbox/test_remove.py Text conflict in breezy/tests/blackbox/test_remove_tree.py Text conflict in breezy/tests/blackbox/test_repair_workingtree.py Text conflict in breezy/tests/blackbox/test_resolve.py Text conflict in breezy/tests/blackbox/test_resolve_location.py Text conflict in breezy/tests/blackbox/test_revert.py Text conflict in breezy/tests/blackbox/test_revision_history.py Text conflict in breezy/tests/blackbox/test_revision_info.py Text conflict in breezy/tests/blackbox/test_revno.py Text conflict in breezy/tests/blackbox/test_rmbranch.py Text conflict in breezy/tests/blackbox/test_script.py Text conflict in breezy/tests/blackbox/test_selftest.py Text conflict in breezy/tests/blackbox/test_send.py Text conflict in breezy/tests/blackbox/test_serve.py Text conflict in breezy/tests/blackbox/test_shared_repository.py Text conflict in breezy/tests/blackbox/test_shelve.py Text conflict in breezy/tests/blackbox/test_sign_my_commits.py Text conflict in breezy/tests/blackbox/test_status.py Text conflict in breezy/tests/blackbox/test_switch.py Text conflict in breezy/tests/blackbox/test_tags.py Text conflict in breezy/tests/blackbox/test_testament.py Text conflict in breezy/tests/blackbox/test_too_much.py Text conflict in breezy/tests/blackbox/test_uncommit.py Text conflict in breezy/tests/blackbox/test_unknowns.py Text conflict in breezy/tests/blackbox/test_update.py Text conflict in breezy/tests/blackbox/test_upgrade.py Text conflict in breezy/tests/blackbox/test_verify_signatures.py Text conflict in breezy/tests/blackbox/test_version.py Text conflict in breezy/tests/blackbox/test_version_info.py Text conflict in breezy/tests/blackbox/test_versioning.py Text conflict in breezy/tests/blackbox/test_view.py Text conflict in breezy/tests/blackbox/test_whoami.py Text conflict in breezy/tests/commands/test_cat.py Text conflict in breezy/tests/commands/test_commit.py Text conflict in breezy/tests/commands/test_init.py Text conflict in breezy/tests/commands/test_init_repository.py Text conflict in breezy/tests/commands/test_merge.py Text conflict in breezy/tests/commands/test_pull.py Text conflict in breezy/tests/commands/test_push.py Text conflict in breezy/tests/commands/test_revert.py Text conflict in breezy/tests/commands/test_update.py Text conflict in breezy/tests/features.py Text conflict in breezy/tests/fixtures.py Text conflict in breezy/tests/http_server.py Text conflict in breezy/tests/http_utils.py Text conflict in breezy/tests/https_server.py Text conflict in breezy/tests/lock_helpers.py Text conflict in breezy/tests/matchers.py Text conflict in breezy/tests/per_branch/__init__.py Text conflict in breezy/tests/per_branch/test_branch.py Text conflict in breezy/tests/per_branch/test_break_lock.py Text conflict in breezy/tests/per_branch/test_check.py Text conflict in breezy/tests/per_branch/test_commit.py Text conflict in breezy/tests/per_branch/test_config.py Text conflict in breezy/tests/per_branch/test_create_checkout.py Text conflict in breezy/tests/per_branch/test_create_clone.py Text conflict in breezy/tests/per_branch/test_hooks.py Text conflict in breezy/tests/per_branch/test_http.py Text conflict in breezy/tests/per_branch/test_iter_merge_sorted_revisions.py Text conflict in breezy/tests/per_branch/test_locking.py Text conflict in breezy/tests/per_branch/test_parent.py Text conflict in breezy/tests/per_branch/test_permissions.py Text conflict in breezy/tests/per_branch/test_pull.py Text conflict in breezy/tests/per_branch/test_push.py Text conflict in breezy/tests/per_branch/test_reconcile.py Text conflict in breezy/tests/per_branch/test_sprout.py Text conflict in breezy/tests/per_branch/test_stacking.py Text conflict in breezy/tests/per_branch/test_tags.py Text conflict in breezy/tests/per_branch/test_uncommit.py Text conflict in breezy/tests/per_branch/test_update.py Text conflict in breezy/tests/per_controldir/__init__.py Text conflict in breezy/tests/per_controldir/test_controldir.py Text conflict in breezy/tests/per_controldir/test_format.py Text conflict in breezy/tests/per_controldir/test_push.py Text conflict in breezy/tests/per_controldir_colo/__init__.py Text conflict in breezy/tests/per_controldir_colo/test_supported.py Text conflict in breezy/tests/per_controldir_colo/test_unsupported.py Text conflict in breezy/tests/per_foreign_vcs/__init__.py Text conflict in breezy/tests/per_foreign_vcs/test_branch.py Text conflict in breezy/tests/per_foreign_vcs/test_repository.py Text conflict in breezy/tests/per_interbranch/__init__.py Text conflict in breezy/tests/per_interbranch/test_copy_content_into.py Text conflict in breezy/tests/per_interbranch/test_fetch.py Text conflict in breezy/tests/per_interbranch/test_get.py Text conflict in breezy/tests/per_interbranch/test_pull.py Text conflict in breezy/tests/per_interbranch/test_push.py Text conflict in breezy/tests/per_interrepository/__init__.py Text conflict in breezy/tests/per_interrepository/test_fetch.py Text conflict in breezy/tests/per_interrepository/test_interrepository.py Text conflict in breezy/tests/per_intertree/__init__.py Text conflict in breezy/tests/per_intertree/test_compare.py Text conflict in breezy/tests/per_intertree/test_find_path.py Text conflict in breezy/tests/per_lock/__init__.py Text conflict in breezy/tests/per_lock/test_lock.py Text conflict in breezy/tests/per_lock/test_temporary_write_lock.py Text conflict in breezy/tests/per_merger.py Text conflict in breezy/tests/per_repository/__init__.py Text conflict in breezy/tests/per_repository/test_add_fallback_repository.py Text conflict in breezy/tests/per_repository/test_break_lock.py Text conflict in breezy/tests/per_repository/test_check.py Text conflict in breezy/tests/per_repository/test_commit_builder.py Text conflict in breezy/tests/per_repository/test_fetch.py Text conflict in breezy/tests/per_repository/test_file_graph.py Text conflict in breezy/tests/per_repository/test_get_parent_map.py Text conflict in breezy/tests/per_repository/test_has_revisions.py Text conflict in breezy/tests/per_repository/test_has_same_location.py Text conflict in breezy/tests/per_repository/test_pack.py Text conflict in breezy/tests/per_repository/test_reconcile.py Text conflict in breezy/tests/per_repository/test_refresh_data.py Text conflict in breezy/tests/per_repository/test_repository.py Text conflict in breezy/tests/per_repository/test_revision.py Text conflict in breezy/tests/per_repository/test_signatures.py Text conflict in breezy/tests/per_repository/test_statistics.py Text conflict in breezy/tests/per_repository/test_write_group.py Text conflict in breezy/tests/per_repository_reference/__init__.py Text conflict in breezy/tests/per_repository_reference/test_add_inventory.py Text conflict in breezy/tests/per_repository_reference/test_add_revision.py Text conflict in breezy/tests/per_repository_reference/test_add_signature_text.py Text conflict in breezy/tests/per_repository_reference/test_break_lock.py Text conflict in breezy/tests/per_repository_reference/test_check.py Text conflict in breezy/tests/per_repository_reference/test_commit_with_stacking.py Text conflict in breezy/tests/per_repository_reference/test_default_stacking.py Text conflict in breezy/tests/per_repository_reference/test_fetch.py Text conflict in breezy/tests/per_repository_reference/test_get_record_stream.py Text conflict in breezy/tests/per_repository_reference/test_graph.py Text conflict in breezy/tests/per_repository_reference/test_initialize.py Text conflict in breezy/tests/per_repository_reference/test_unlock.py Text conflict in breezy/tests/per_transport.py Text conflict in breezy/tests/per_tree/__init__.py Text conflict in breezy/tests/per_tree/test_archive.py Text conflict in breezy/tests/per_tree/test_export.py Text conflict in breezy/tests/per_tree/test_get_file_mtime.py Text conflict in breezy/tests/per_tree/test_get_root_id.py Text conflict in breezy/tests/per_tree/test_get_symlink_target.py Text conflict in breezy/tests/per_tree/test_ids.py Text conflict in breezy/tests/per_tree/test_is_executable.py Text conflict in breezy/tests/per_tree/test_list_files.py Text conflict in breezy/tests/per_tree/test_path_content_summary.py Text conflict in breezy/tests/per_tree/test_revision_tree.py Text conflict in breezy/tests/per_tree/test_symlinks.py Text conflict in breezy/tests/per_tree/test_test_trees.py Text conflict in breezy/tests/per_tree/test_transform.py Text conflict in breezy/tests/per_tree/test_tree.py Text conflict in breezy/tests/per_tree/test_walkdirs.py Text conflict in breezy/tests/per_uifactory/__init__.py Text conflict in breezy/tests/per_workingtree/__init__.py Text conflict in breezy/tests/per_workingtree/test_add.py Text conflict in breezy/tests/per_workingtree/test_add_reference.py Text conflict in breezy/tests/per_workingtree/test_basis_inventory.py Text conflict in breezy/tests/per_workingtree/test_break_lock.py Text conflict in breezy/tests/per_workingtree/test_canonical_path.py Text conflict in breezy/tests/per_workingtree/test_check_state.py Text conflict in breezy/tests/per_workingtree/test_commit.py Text conflict in breezy/tests/per_workingtree/test_content_filters.py Text conflict in breezy/tests/per_workingtree/test_eol_conversion.py Text conflict in breezy/tests/per_workingtree/test_executable.py Text conflict in breezy/tests/per_workingtree/test_get_file_mtime.py Text conflict in breezy/tests/per_workingtree/test_is_ignored.py Text conflict in breezy/tests/per_workingtree/test_locking.py Text conflict in breezy/tests/per_workingtree/test_merge_from_branch.py Text conflict in breezy/tests/per_workingtree/test_mkdir.py Text conflict in breezy/tests/per_workingtree/test_move.py Text conflict in breezy/tests/per_workingtree/test_nested_specifics.py Text conflict in breezy/tests/per_workingtree/test_parents.py Text conflict in breezy/tests/per_workingtree/test_paths2ids.py Text conflict in breezy/tests/per_workingtree/test_pull.py Text conflict in breezy/tests/per_workingtree/test_readonly.py Text conflict in breezy/tests/per_workingtree/test_remove.py Text conflict in breezy/tests/per_workingtree/test_rename_one.py Text conflict in breezy/tests/per_workingtree/test_revision_tree.py Text conflict in breezy/tests/per_workingtree/test_set_root_id.py Text conflict in breezy/tests/per_workingtree/test_shelf_manager.py Text conflict in breezy/tests/per_workingtree/test_smart_add.py Text conflict in breezy/tests/per_workingtree/test_symlinks.py Text conflict in breezy/tests/per_workingtree/test_transform.py Text conflict in breezy/tests/per_workingtree/test_uncommit.py Text conflict in breezy/tests/per_workingtree/test_unversion.py Text conflict in breezy/tests/per_workingtree/test_views.py Text conflict in breezy/tests/per_workingtree/test_walkdirs.py Text conflict in breezy/tests/per_workingtree/test_workingtree.py Text conflict in breezy/tests/scenarios.py Text conflict in breezy/tests/script.py Text conflict in breezy/tests/ssl_certs/__init__.py Text conflict in breezy/tests/ssl_certs/create_ssls.py Text conflict in breezy/tests/stub_sftp.py Text conflict in breezy/tests/test__annotator.py Contents conflict in breezy/tests/test__chunks_to_lines.py Text conflict in breezy/tests/test__known_graph.py Contents conflict in breezy/tests/test__walkdirs_win32.py Text conflict in breezy/tests/test_annotate.py Text conflict in breezy/tests/test_atomicfile.py Text conflict in breezy/tests/test_bad_files.py Text conflict in breezy/tests/test_bedding.py Text conflict in breezy/tests/test_bisect.py Text conflict in breezy/tests/test_branch.py Text conflict in breezy/tests/test_branchbuilder.py Text conflict in breezy/tests/test_bugtracker.py Text conflict in breezy/tests/test_cache_utf8.py Text conflict in breezy/tests/test_cethread.py Text conflict in breezy/tests/test_clean_tree.py Text conflict in breezy/tests/test_cmdline.py Text conflict in breezy/tests/test_commands.py Text conflict in breezy/tests/test_commit.py Text conflict in breezy/tests/test_commit_merge.py Text conflict in breezy/tests/test_config.py Text conflict in breezy/tests/test_conflicts.py Text conflict in breezy/tests/test_controldir.py Text conflict in breezy/tests/test_counted_lock.py Text conflict in breezy/tests/test_crash.py Text conflict in breezy/tests/test_debug.py Text conflict in breezy/tests/test_decorators.py Text conflict in breezy/tests/test_delta.py Text conflict in breezy/tests/test_diff.py Text conflict in breezy/tests/test_directory_service.py Text conflict in breezy/tests/test_dirty_tracker.py Text conflict in breezy/tests/test_email_message.py Text conflict in breezy/tests/test_eol_filters.py Text conflict in breezy/tests/test_errors.py Text conflict in breezy/tests/test_estimate_compressed_size.py Text conflict in breezy/tests/test_export.py Text conflict in breezy/tests/test_export_pot.py Text conflict in breezy/tests/test_extract.py Text conflict in breezy/tests/test_features.py Text conflict in breezy/tests/test_fetch.py Text conflict in breezy/tests/test_fifo_cache.py Text conflict in breezy/tests/test_filter_tree.py Text conflict in breezy/tests/test_filters.py Text conflict in breezy/tests/test_fixtures.py Text conflict in breezy/tests/test_foreign.py Text conflict in breezy/tests/test_forge.py Text conflict in breezy/tests/test_generate_docs.py Text conflict in breezy/tests/test_globbing.py Text conflict in breezy/tests/test_gpg.py Text conflict in breezy/tests/test_graph.py Text conflict in breezy/tests/test_grep.py Text conflict in breezy/tests/test_help.py Text conflict in breezy/tests/test_hooks.py Text conflict in breezy/tests/test_http.py Text conflict in breezy/tests/test_http_response.py Text conflict in breezy/tests/test_https_ca_bundle.py Text conflict in breezy/tests/test_https_urllib.py Text conflict in breezy/tests/test_i18n.py Text conflict in breezy/tests/test_ignores.py Text conflict in breezy/tests/test_import_tariff.py Text conflict in breezy/tests/test_info.py Text conflict in breezy/tests/test_lazy_import.py Text conflict in breezy/tests/test_lazy_regex.py Text conflict in breezy/tests/test_library_state.py Text conflict in breezy/tests/test_location.py Text conflict in breezy/tests/test_lock.py Text conflict in breezy/tests/test_lockdir.py Text conflict in breezy/tests/test_log.py Text conflict in breezy/tests/test_lru_cache.py Text conflict in breezy/tests/test_lsprof.py Text conflict in breezy/tests/test_mail_client.py Text conflict in breezy/tests/test_matchers.py Text conflict in breezy/tests/test_merge.py Text conflict in breezy/tests/test_merge_core.py Text conflict in breezy/tests/test_merge_directive.py Text conflict in breezy/tests/test_mergeable.py Text conflict in breezy/tests/test_mergetools.py Text conflict in breezy/tests/test_missing.py Text conflict in breezy/tests/test_msgeditor.py Text conflict in breezy/tests/test_multiparent.py Text conflict in breezy/tests/test_multiwalker.py Text conflict in breezy/tests/test_mutabletree.py Text conflict in breezy/tests/test_nonascii.py Text conflict in breezy/tests/test_options.py Text conflict in breezy/tests/test_osutils.py Text conflict in breezy/tests/test_osutils_encodings.py Text conflict in breezy/tests/test_patch.py Text conflict in breezy/tests/test_patches.py Text conflict in breezy/tests/test_plugins.py Text conflict in breezy/tests/test_progress.py Text conflict in breezy/tests/test_pyutils.py Text conflict in breezy/tests/test_reconcile.py Text conflict in breezy/tests/test_reconfigure.py Text conflict in breezy/tests/test_registry.py Text conflict in breezy/tests/test_revert.py Text conflict in breezy/tests/test_revision.py Text conflict in breezy/tests/test_revisionspec.py Text conflict in breezy/tests/test_revisiontree.py Text conflict in breezy/tests/test_rules.py Text conflict in breezy/tests/test_scenarios.py Text conflict in breezy/tests/test_script.py Text conflict in breezy/tests/test_selftest.py Text conflict in breezy/tests/test_server.py Text conflict in breezy/tests/test_setup.py Text conflict in breezy/tests/test_sftp_transport.py Text conflict in breezy/tests/test_shelf.py Text conflict in breezy/tests/test_shelf_ui.py Text conflict in breezy/tests/test_smart_add.py Text conflict in breezy/tests/test_smtp_connection.py Text conflict in breezy/tests/test_source.py Text conflict in breezy/tests/test_ssh_transport.py Text conflict in breezy/tests/test_status.py Text conflict in breezy/tests/test_strace.py Text conflict in breezy/tests/test_switch.py Text conflict in breezy/tests/test_symbol_versioning.py Text conflict in breezy/tests/test_tag.py Text conflict in breezy/tests/test_test_server.py Text conflict in breezy/tests/test_timestamp.py Text conflict in breezy/tests/test_trace.py Text conflict in breezy/tests/test_transform.py Text conflict in breezy/tests/test_transport.py Text conflict in breezy/tests/test_tree.py Text conflict in breezy/tests/test_treebuilder.py Text conflict in breezy/tests/test_treeshape.py Text conflict in breezy/tests/test_tsort.py Text conflict in breezy/tests/test_ui.py Text conflict in breezy/tests/test_uncommit.py Text conflict in breezy/tests/test_upgrade.py Text conflict in breezy/tests/test_upgrade_stacked.py Text conflict in breezy/tests/test_upstream_import.py Text conflict in breezy/tests/test_url_policy_open.py Text conflict in breezy/tests/test_urlutils.py Text conflict in breezy/tests/test_utextwrap.py Text conflict in breezy/tests/test_version.py Text conflict in breezy/tests/test_version_info.py Text conflict in breezy/tests/test_views.py Text conflict in breezy/tests/test_whitebox.py Text conflict in breezy/tests/test_win32utils.py Text conflict in breezy/tests/test_workingtree.py Text conflict in breezy/tests/test_workspace.py Text conflict in breezy/tests/test_wsgi.py Text conflict in breezy/tests/testui.py Text conflict in breezy/tests/treeshape.py Text conflict in breezy/textfile.py Contents conflict in breezy/timestamp.py Text conflict in breezy/trace.py Text conflict in breezy/transactions.py Text conflict in breezy/transform.py Text conflict in breezy/transport/__init__.py Text conflict in breezy/transport/brokenrename.py Text conflict in breezy/transport/chroot.py Text conflict in breezy/transport/decorator.py Text conflict in breezy/transport/fakenfs.py Text conflict in breezy/transport/fakevfat.py Text conflict in breezy/transport/gio_transport.py Text conflict in breezy/transport/http/__init__.py Text conflict in breezy/transport/http/response.py Text conflict in breezy/transport/http/urllib.py Text conflict in breezy/transport/local.py Text conflict in breezy/transport/log.py Text conflict in breezy/transport/memory.py Text conflict in breezy/transport/pathfilter.py Text conflict in breezy/transport/readonly.py Text conflict in breezy/transport/remote.py Text conflict in breezy/transport/sftp.py Text conflict in breezy/transport/ssh/__init__.py Text conflict in breezy/transport/trace.py Text conflict in breezy/transport/unlistable.py Text conflict in breezy/tree.py Text conflict in breezy/treebuilder.py Text conflict in breezy/tsort.py Text conflict in breezy/ui/__init__.py Text conflict in breezy/ui/text.py Text conflict in breezy/uncommit.py Text conflict in breezy/upgrade.py Text conflict in breezy/upstream_import.py Text conflict in breezy/url_policy_open.py Text conflict in breezy/urlutils.py Text conflict in breezy/util/simplemapi.py Text conflict in breezy/version.py Text conflict in breezy/version_info_formats/__init__.py Text conflict in breezy/version_info_formats/format_custom.py Text conflict in breezy/version_info_formats/format_python.py Text conflict in breezy/version_info_formats/format_rio.py Text conflict in breezy/version_info_formats/format_yaml.py Text conflict in breezy/views.py Text conflict in breezy/win32utils.py Text conflict in breezy/workingtree.py Text conflict in crates/bazaar-py/src/rio.rs Text conflict in doc/developers/conf.py Text conflict in doc/en/conf.py Text conflict in profile_imports.py Text conflict in setup.py Text conflict in tools/brzflakes.py Text conflict in tools/capture_tree.py Text conflict in tools/check-newsbugs.py Text conflict in tools/fixed-in.py Text conflict in tools/flake8_lazy_import.py Text conflict in tools/generate_docs.py Text conflict in tools/generate_release_notes.py Text conflict in tools/package_docs.py Text conflict in tools/package_mf.py Text conflict in tools/rst2html.py Text conflict in tools/rst2pdf.py Text conflict in tools/rst2prettyhtml.py Text conflict in tools/time_graph.py Text conflict in tools/win32/bootstrap.py Text conflict in tools/win32/brz-win32-bdist-postinstall.py Text conflict in tools/win32/brz_postinstall.py Text conflict in tools/win32/build_release.py Text conflict in tools/win32/file_version.py Text conflict in tools/win32/run_script.py
To merge this branch:	bzr merge lp://qastaging/~jelmer/brz/codespell
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Breezy developers		2024-11-14	Pending
Review via email: mp+476501@code.qastaging.launchpad.net

Commit message

Fix spelling errors in code

Description of the change

Fix spelling errors

-------8<-------
SUMMARY:
abandonded 1
acccept 3
acceptible 1
accidential 1
accidently 3
accomodate 9
accomodates 1
accomodation 1
accumlates 1
accumlating 1
adjustement 2
adminstrator 1
adressing 1
agressive 1
alllows 1
alreay 1
alwyas 1
ambigious 1
analagous 3
ancestory 3
anid 4
anway 1
aplication 1
approriate 1
aribtrary 1
arive 1
associted 1
asssume 1
assuptions 1
asyncronously 1
attachement 1
attachements 1
attemps 1
authenication 1
authentification3
authetication 1
automaticaly 1
availible 1
bandwith 3
becuase 1
begining 2
betweeen 10
betwen 3
boostrap 1
branchs 1
cachable 2
cant 15
childen 1
chosing 1
classs 1
classses 1
coallesced 1
comand 1
comando 1
comits 1
comitting 1
commitable 7
commited 2
commiting 4
committ 1
commmit 2
comparision 3
comparisions 2
compatability 1
compatibile 1
compatibilty 1
compatiblity 1
complet 1
completition 1
conents 1
configuation 1
connexion 1
containg 2
contex 1
contexta 5
contraint 1
contruct 1
contructing 1
contructor 1
contructs 1
convertable 2
could't 1
crate 1
critera 1
debuging 1
decribed 1
defaulty 4
delcared 1
densly 1
dependant 2
descibes 1
descriped 1
desireable 1
develoment 1
developement 1
devels 4
diamon 1
dictonary 1
didnt 1
differes 1
directores 1
directrory 1
diretory 1
disutils 1
does't 2
dont't 1
emmitted 1
encoutered 1
enought 1
enrty 1
envirnoment 1
envrionment 1
evenually 1
exeception 1
execption 1
exepect 1
explicitely 5
explicity 1
explictly 6
extensiones 1
flagg 1
focusses 1
followng 1
follwed 1
formated 1
forseeable 2
foward 1
fragements 2
futher 2
generaly 1
guarentee 1
homogenous 3
humber 1
ignors 1
implemenations2
implemeted 2
implmentations3
inacessible 1
indefinately 1
indentical 1
independant 1
indicies 1
initialy 1
interger 1
intial 1
intialize 2
invidual 1
isnt 1
keypair 3
keypairs 1
keywork 1
libarary 1
likelyhood 1
maintaing 1
mapp 3
ment 2
mergable 1
mesage 1
mesages 2
mimimum 1
miniumum 1
minmal 1
mising 1
mispellings 1
missuse 1
modfy 2
mutiple 2
mutliple 1
nam 1
ndoe 1
necessarly 3
neeed 1
non-existant 8
nonexistant 3
noone 3
normales 1
nothin 2
notifcations 1
obejct 1
occured 18
occurence 1
occurences 9
occuring 3
ofrom 1
oject 1
ommitted 1
optimial 1
optionaly 2
optmizations 1
ore 1
origianl 1
ouput 7
ouputs 1
overal 1
overrideable 2
overriden 8
paramter 1
parenthesed 3
parth 43
particularily 1
partioned 1
patters 1
perfomed 1
perfoms 28
persitent 1
plausability 1
posible 2
predicable 1
prefered 1
prepatory 1
preprended 1
prexisting 1
procesing 1
propogate 8
propogated 2
pullrequest 1
punctation 1
realeases 1
recieve 2
recieved 1
recommanded 1
recusrsive 1
reenable 1
refered 2
refrerence 1
regsitered 1
reivison 1
relase 1
relevent 1
renderd 1
renegociate 1
reponse 2
reponses 1
reponsible 2
repostiories 2
repostories 1
reproducability1
requsting 1
responsability1
resuable 1
retreiving 2
retrict 1
retrive 1
returing 1
revison 2
revisons 2
revsion 1
seach 2
sepcified 1
seperate 6
seperately 1
seperator 1
seqence 1
ser 5
sharable 1
shorcut 2
shorcuts 2
shoud 1
shoudl 1
shuld 1
silenty 1
similiar 1
simpliest 1
situtaions 1
skippd 1
specfic 5
specfically 1
specfy 2
specificly 2
stucked 1
succesful 1
succesfully 3
successfull 1
succint 1
sucess 1
sucessfully 2
sufficent 2
superceded 1
suppport 3
supress 1
synchonization1
targetted 1
targetting 1
teh 3
thats 19
theres 6
thresold 2
tortise 1
tranform 2
tranlsation 2
tranport 3
tre 3
trivally 1
truely 1
uncommmitted 2
unfortunatly 1
unknonwn 1
unkown 1
unncessary 1
unparseable 3
unsuported 1
upate 1
usuable 1
verions 1
verison 1
verisons 1
want's 1
whats 10
wierd 1
wih 1
willl 1
withing 2
withough 1
wont 3
worthwile 2
writeing 1
wth 1

Revision history for this message

The Breezy Bot (the-breezy-bot) wrote on 2024-11-18:

#

Download full text (3.2 KiB)

Attempt to merge into lp:brz failed due to conflicts:

contents conflict in breezy/_walkdirs_win32.pyx
text conflict in breezy/builtins.py
contents conflict in breezy/bzr/_groupcompress_py.py
text conflict in breezy/bzr/dirstate.py
text conflict in breezy/bzr/groupcompress.py
text conflict in breezy/bzr/inventory.py
contents conflict in breezy/bzr/rio.py
text conflict in breezy/bzr/tests/per_inventory/basics.py
text conflict in breezy/bzr/tests/test_bundle.py
text conflict in breezy/bzr/tests/test_bzrdir.py
text conflict in breezy/bzr/tests/test_chk_map.py
text conflict in breezy/bzr/tests/test_dirstate.py
text conflict in breezy/bzr/tests/test_remote.py
text conflict in breezy/bzr/tests/test_smart_transport.py
text conflict in breezy/bzr/tests/test_xml.py
text conflict in breezy/cmdline.py
text conflict in breezy/commands.py
text conflict in breezy/errors.py
text conflict in breezy/git/remote.py
text conflict in breezy/gpg.py
text conflict in breezy/grep.py
text conflict in breezy/lock.py
text conflict in breezy/multiparent.py
text conflict in breezy/osutils.py
text conflict in breezy/plugins/upload/tests/test_upload.py
text conflict in breezy/plugins/weave_fmt/bzrdir.py
text conflict in breezy/progress.py
text conflict in breezy/registry.py
text conflict in breezy/repository.py
text conflict in breezy/revisionspec.py
text conflict in breezy/tests/blackbox/test_merge.py
text conflict in breezy/tests/blackbox/test_send.py
text conflict in breezy/tests/blackbox/test_too_much.py
text conflict in breezy/tests/blackbox/test_whoami.py
text conflict in breezy/tests/fixtures.py
text conflict in breezy/tests/per_branch/test_locking.py
text conflict in breezy/tests/per_branch/test_update.py
text conflict in breezy/tests/per_controldir/test_controldir.py
text conflict in breezy/tests/per_repository/test_repository.py
text conflict in breezy/tests/per_workingtree/test_remove.py
text conflict in breezy/tests/per_workingtree/test_smart_add.py
text conflict in breezy/tests/per_workingtree/test_transform.py
text conflict in breezy/tests/per_workingtree/test_workingtree.py
text conflict in breezy/tests/stub_sftp.py
text conflict in breezy/tests/test_annotate.py
text conflict in breezy/tests/test_commit.py
text conflict in breezy/tests/test_config.py
text conflict in breezy/tests/test_errors.py
text conflict in breezy/tests/test_foreign.py
text conflict in breezy/tests/test_globbing.py
text conflict in breezy/tests/test_grep.py
text conflict in breezy/tests/test_http_response.py
text conflict in breezy/tests/test_i18n.py
text conflict in breezy/tests/test_mail_client.py
text conflict in breezy/tests/test_merge_core.py
text conflict in breezy/tests/test_nonascii.py
text conflict in breezy/tests/test_osutils.py
text conflict in breezy/tests/test_server.py
text conflict in breezy/tests/test_setup.py
text conflict in breezy/tests/test_sftp_transport.py
text conflict in breezy/tests/test_source.py
text conflict in breezy/tests/test_transform.py
text conflict in breezy/tests/test_transport.py
text conflict in breezy/tests/test_ui.py
contents conflict in breezy/timestamp.py
text conflict in breezy/trace.py
text conflict in breezy/transform.py
text conflict in breez...

Unmerged revisions

7687. By Jelmer Vernooij on 2024-11-18

Fix formatting

7686. By Jelmer Vernooij on 2023-02-02

Fix spelling errors

-------8<-------
SUMMARY:
abandonded 1
acccept 3
acceptible 1
accidential 1
accidently 3
accomodate 9
accomodates 1
accomodation 1
accumlates 1
accumlating 1
adjustement 2
adminstrator 1
adressing 1
agressive 1
alllows 1
alreay 1
alwyas 1
ambigious 1
analagous 3
ancestory 3
anid 4
anway 1
aplication 1
approriate 1
aribtrary 1
arive 1
associted 1
asssume 1
assuptions 1
asyncronously 1
attachement 1
attachements 1
attemps 1
authenication 1
authentification3
authetication 1
automaticaly 1
availible 1
bandwith 3
becuase 1
begining 2
betweeen 10
betwen 3
boostrap 1
branchs 1
cachable 2
cant 15
childen 1
chosing 1
classs 1
classses 1
coallesced 1
comand 1
comando 1
comits 1
comitting 1
commitable 7
commited 2
commiting 4
committ 1
commmit 2
comparision 3
comparisions 2
compatability 1
compatibile 1
compatibilty 1
compatiblity 1
complet 1
completition 1
conents 1
configuation 1
connexion 1
containg 2
contex 1
contexta 5
contraint 1
contruct 1
contructing 1
contructor 1
contructs 1
convertable 2
could't 1
crate 1
critera 1
debuging 1
decribed 1
defaulty 4
delcared 1
densly 1
dependant 2
descibes 1
descriped 1
desireable 1
develoment 1
developement 1
devels 4
diamon 1
dictonary 1
didnt 1
differes 1
directores 1
directrory 1
diretory 1
disutils 1
does't 2
dont't 1
emmitted 1
encoutered 1
enought 1
enrty 1
envirnoment 1
envrionment 1
evenually 1
exeception 1
execption 1
exepect 1
explicitely 5
explicity 1
explictly 6
extensiones 1
flagg 1
focusses 1
followng 1
follwed 1
formated 1
forseeable 2
foward 1
fragements 2
futher 2
generaly 1
guarentee 1
homogenous 3
humber 1
ignors 1
implemenations2
implemeted 2
implmentations3
inacessible 1
indefinately 1
indentical 1
independant 1
indicies 1
initialy 1
interger 1
intial 1
intialize 2
invidual 1
isnt 1
keypair 3
keypairs 1
keywork 1
libarary 1
likelyhood 1
maintaing 1
mapp 3
ment 2
mergable 1
mesage 1
mesages 2
mimimum 1
miniumum 1
minmal 1
mising 1
mispellings 1
missuse 1
modfy 2
mutiple 2
mutliple 1
nam 1
ndoe 1
necessarly 3
neeed 1
non-existant 8
nonexistant 3
noone 3
normales 1
nothin 2
notifcations 1
obejct 1
occured 18
occurence 1
occurences 9
occuring 3
ofrom 1
oject 1
ommitted 1
optimial 1
optionaly 2
optmizations 1
ore 1
origianl 1
ouput 7
ouputs 1
overal 1
overrideable 2
overriden 8
paramter 1
parenthesed 3
parth 43
particularily 1
partioned 1
patters 1
perfomed 1
perfoms 28
persitent 1
plausability 1
posible 2
predicable 1
prefered 1
prepatory 1
preprended 1
prexisting 1
procesing 1
propogate 8
propogated 2
pullrequest 1
punctation 1
realeases 1
recieve 2
recieved 1
recommanded 1
recusrsive 1
reenable 1
refered 2
refrerence 1
regsitered 1
reivison 1
relase 1
relevent 1
renderd 1
renegociate 1
reponse 2
reponses 1
reponsible 2
repostiories 2
repostories 1
reproducability1
requsting 1
responsability1
resuable 1
retreiving 2
retrict 1
retrive 1
returing 1
revison 2
revisons 2
revsion 1
seach 2
sepcified 1
seperate 6
seperately 1
seperator 1
seqence 1
ser 5
sharable 1
shorcut 2
shorcuts 2
shoud 1
shoudl 1
shuld 1
silenty 1
similiar 1
simpliest 1
situtaions 1
skippd 1
specfic 5
specfically 1
specfy 2
specificly 2
stucked 1
succesful 1
succesfully 3
successfull 1
succint 1
sucess 1
sucessfully 2
sufficent 2
superceded 1
suppport 3
supress 1
synchonization1
targetted 1
targetting 1
teh 3
thats 19
theres 6
thresold 2
tortise 1
tranform 2
tranlsation 2
tranport 3
tre 3
trivally 1
truely 1
uncommmitted 2
unfortunatly 1
unknonwn 1
unkown 1
unncessary 1
unparseable 3
unsuported 1
upate 1
usuable 1
verions 1
verison 1
verisons 1
want's 1
whats 10
wierd 1
wih 1
willl 1
withing 2
withough 1
wont 3
worthwile 2
writeing 1
wth 1

Breezy

Merge lp://qastaging/~jelmer/brz/codespell into lp://qastaging/brz

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers