lp:~jelmer/brz/lock-context
Created by
Jelmer Vernooij
and last modified
Only
Jelmer Vernooij
can upload to this branch. If you are
Jelmer Vernooij
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Martin Packman: Approve
- Jelmer Vernooij: Pending requested
-
Diff: 4231 lines (+844/-1105)63 files modifiedbreezy/bisect.py (+4/-11)
breezy/branch.py (+209/-245)
breezy/builtins.py (+2/-5)
breezy/bundle/serializer/__init__.py (+2/-8)
breezy/bundle/serializer/v08.py (+1/-4)
breezy/bundle/serializer/v4.py (+1/-4)
breezy/bzr/branch.py (+53/-51)
breezy/bzr/dirstate.py (+17/-16)
breezy/bzr/inventorytree.py (+24/-26)
breezy/bzr/knitrepo.py (+32/-32)
breezy/bzr/pack_repo.py (+2/-3)
breezy/bzr/remote.py (+191/-191)
breezy/bzr/repository.py (+1/-1)
breezy/bzr/smart/branch.py (+2/-5)
breezy/bzr/smart/repository.py (+6/-24)
breezy/bzr/vf_repository.py (+81/-88)
breezy/bzr/workingtree.py (+4/-16)
breezy/bzr/workingtree_4.py (+1/-4)
breezy/clean_tree.py (+1/-4)
breezy/config.py (+8/-14)
breezy/conflicts.py (+1/-4)
breezy/decorators.py (+8/-44)
breezy/diff.py (+1/-4)
breezy/export/__init__.py (+1/-4)
breezy/inter.py (+3/-0)
breezy/lock.py (+13/-1)
breezy/memorytree.py (+4/-0)
breezy/mutabletree.py (+1/-4)
breezy/plugins/email/emailer.py (+1/-6)
breezy/plugins/fastimport/branch_updater.py (+1/-4)
breezy/plugins/fastimport/exporter.py (+1/-4)
breezy/plugins/fastimport/tests/test_generic_processor.py (+6/-9)
breezy/plugins/grep/grep.py (+3/-12)
breezy/plugins/launchpad/lp_api.py (+1/-4)
breezy/plugins/launchpad/lp_api_lite.py (+1/-4)
breezy/plugins/launchpad/lp_propose.py (+4/-13)
breezy/plugins/stats/cmds.py (+5/-20)
breezy/plugins/upload/cmds.py (+2/-8)
breezy/plugins/weave_fmt/workingtree.py (+3/-2)
breezy/revisionspec.py (+4/-18)
breezy/revisiontree.py (+2/-1)
breezy/switch.py (+3/-14)
breezy/tag.py (+1/-4)
breezy/tests/blackbox/test_cat_revision.py (+1/-4)
breezy/tests/blackbox/test_repair_workingtree.py (+1/-4)
breezy/tests/blackbox/test_serve.py (+1/-4)
breezy/tests/matchers.py (+3/-12)
breezy/tests/per_branch/test_branch.py (+7/-4)
breezy/tests/per_branch/test_locking.py (+33/-46)
breezy/tests/per_bzrdir/test_bzrdir.py (+41/-48)
breezy/tests/per_repository_vf/test_refresh_data.py (+5/-2)
breezy/tests/test_config.py (+2/-1)
breezy/tests/test_decorators.py (+6/-1)
breezy/tests/test_smart.py (+2/-2)
breezy/tests/test_workingtree.py (+2/-0)
breezy/transform.py (+9/-16)
breezy/transport/sftp.py (+4/-0)
breezy/tree.py (+2/-1)
breezy/version_info_formats/__init__.py (+1/-4)
breezy/views.py (+1/-4)
breezy/workingtree.py (+3/-12)
doc/en/release-notes/brz-3.0.txt (+7/-0)
tools/time_graph.py (+1/-4)
Superseded
for merging
into
lp:~emansije/brz/brz
- Jelmer Vernooij: Pending requested
-
Diff: 16103 lines (+3875/-3170)195 files modified.testr.conf (+1/-1)
Makefile (+27/-8)
breezy/bisect.py (+8/-12)
breezy/branch.py (+221/-250)
breezy/builtins.py (+51/-18)
breezy/bundle/serializer/__init__.py (+2/-8)
breezy/bundle/serializer/v08.py (+1/-4)
breezy/bundle/serializer/v4.py (+1/-4)
breezy/bzr/_dirstate_helpers_py.py (+3/-4)
breezy/bzr/_dirstate_helpers_pyx.pyx (+6/-6)
breezy/bzr/_knit_load_data_py.py (+4/-4)
breezy/bzr/_knit_load_data_pyx.pyx (+2/-3)
breezy/bzr/branch.py (+58/-60)
breezy/bzr/btree_index.py (+12/-13)
breezy/bzr/bzrdir.py (+13/-4)
breezy/bzr/dirstate.py (+28/-17)
breezy/bzr/groupcompress.py (+20/-5)
breezy/bzr/groupcompress_repo.py (+2/-2)
breezy/bzr/index.py (+82/-27)
breezy/bzr/inventorytree.py (+24/-26)
breezy/bzr/knit.py (+79/-6)
breezy/bzr/knitpack_repo.py (+9/-9)
breezy/bzr/knitrepo.py (+34/-34)
breezy/bzr/pack_repo.py (+2/-3)
breezy/bzr/remote.py (+196/-196)
breezy/bzr/repository.py (+2/-2)
breezy/bzr/smart/branch.py (+2/-5)
breezy/bzr/smart/repository.py (+6/-24)
breezy/bzr/smart/request.py (+2/-1)
breezy/bzr/vf_repository.py (+81/-88)
breezy/bzr/workingtree.py (+5/-17)
breezy/bzr/workingtree_3.py (+2/-2)
breezy/bzr/workingtree_4.py (+6/-9)
breezy/clean_tree.py (+1/-4)
breezy/commands.py (+17/-17)
breezy/commit.py (+19/-4)
breezy/config.py (+25/-26)
breezy/conflicts.py (+1/-4)
breezy/controldir.py (+12/-2)
breezy/decorators.py (+8/-44)
breezy/diff.py (+1/-4)
breezy/directory_service.py (+22/-2)
breezy/errors.py (+0/-364)
breezy/export/__init__.py (+1/-4)
breezy/foreign.py (+4/-1)
breezy/help_topics/__init__.py (+1/-1)
breezy/hooks.py (+14/-4)
breezy/info.py (+2/-1)
breezy/inter.py (+3/-0)
breezy/lock.py (+13/-1)
breezy/lru_cache.py (+5/-5)
breezy/memorytree.py (+5/-1)
breezy/msgeditor.py (+7/-1)
breezy/mutabletree.py (+1/-4)
breezy/osutils.py (+14/-3)
breezy/plugins/email/emailer.py (+1/-6)
breezy/plugins/fastimport/branch_updater.py (+1/-4)
breezy/plugins/fastimport/cmds.py (+3/-3)
breezy/plugins/fastimport/exporter.py (+1/-4)
breezy/plugins/fastimport/helpers.py (+9/-9)
breezy/plugins/fastimport/tests/test_generic_processor.py (+6/-9)
breezy/plugins/grep/grep.py (+3/-12)
breezy/plugins/launchpad/cmds.py (+5/-2)
breezy/plugins/launchpad/lp_api.py (+1/-4)
breezy/plugins/launchpad/lp_api_lite.py (+1/-4)
breezy/plugins/launchpad/lp_propose.py (+4/-13)
breezy/plugins/stats/cmds.py (+6/-23)
breezy/plugins/upload/cmds.py (+10/-12)
breezy/plugins/weave_fmt/branch.py (+2/-2)
breezy/plugins/weave_fmt/bzrdir.py (+7/-3)
breezy/plugins/weave_fmt/repository.py (+5/-5)
breezy/plugins/weave_fmt/workingtree.py (+4/-3)
breezy/push.py (+2/-1)
breezy/reconfigure.py (+91/-18)
breezy/repository.py (+17/-6)
breezy/revisionspec.py (+4/-18)
breezy/revisiontree.py (+2/-1)
breezy/rules.py (+10/-2)
breezy/switch.py (+3/-14)
breezy/tag.py (+1/-4)
breezy/tests/__init__.py (+37/-9)
breezy/tests/blackbox/__init__.py (+1/-0)
breezy/tests/blackbox/test_branch.py (+6/-6)
breezy/tests/blackbox/test_cat_revision.py (+1/-4)
breezy/tests/blackbox/test_link_tree.py (+58/-0)
breezy/tests/blackbox/test_pull.py (+9/-9)
breezy/tests/blackbox/test_push.py (+1/-1)
breezy/tests/blackbox/test_repair_workingtree.py (+1/-4)
breezy/tests/blackbox/test_selftest.py (+9/-4)
breezy/tests/blackbox/test_serve.py (+1/-4)
breezy/tests/features.py (+16/-6)
breezy/tests/fixtures.py (+4/-4)
breezy/tests/matchers.py (+3/-12)
breezy/tests/per_branch/__init__.py (+14/-13)
breezy/tests/per_branch/test_branch.py (+49/-43)
breezy/tests/per_branch/test_create_checkout.py (+6/-6)
breezy/tests/per_branch/test_create_clone.py (+9/-9)
breezy/tests/per_branch/test_dotted_revno_to_revision_id.py (+22/-14)
breezy/tests/per_branch/test_get_revision_id_to_revno_map.py (+21/-15)
breezy/tests/per_branch/test_locking.py (+33/-46)
breezy/tests/per_branch/test_pull.py (+32/-32)
breezy/tests/per_branch/test_push.py (+17/-17)
breezy/tests/per_branch/test_revision_id_to_dotted_revno.py (+6/-6)
breezy/tests/per_branch/test_revision_id_to_revno.py (+5/-5)
breezy/tests/per_branch/test_sprout.py (+32/-30)
breezy/tests/per_branch/test_stacking.py (+40/-41)
breezy/tests/per_branch/test_tags.py (+69/-73)
breezy/tests/per_bzrdir/test_bzrdir.py (+41/-48)
breezy/tests/per_controldir/test_controldir.py (+256/-232)
breezy/tests/per_controldir/test_push.py (+6/-6)
breezy/tests/per_foreign_vcs/test_branch.py (+3/-2)
breezy/tests/per_interbranch/__init__.py (+15/-15)
breezy/tests/per_interbranch/test_fetch.py (+21/-22)
breezy/tests/per_interbranch/test_pull.py (+22/-22)
breezy/tests/per_interbranch/test_push.py (+14/-14)
breezy/tests/per_interrepository/__init__.py (+4/-4)
breezy/tests/per_intertree/__init__.py (+3/-3)
breezy/tests/per_repository/__init__.py (+2/-2)
breezy/tests/per_repository/test_commit_builder.py (+1/-1)
breezy/tests/per_repository/test_fetch.py (+19/-19)
breezy/tests/per_repository/test_file_graph.py (+4/-3)
breezy/tests/per_repository/test_repository.py (+108/-102)
breezy/tests/per_repository/test_revision.py (+5/-6)
breezy/tests/per_repository/test_signatures.py (+30/-31)
breezy/tests/per_repository_vf/test_refresh_data.py (+5/-2)
breezy/tests/per_tree/test_annotate_iter.py (+15/-15)
breezy/tests/per_tree/test_export.py (+3/-3)
breezy/tests/per_tree/test_get_file_mtime.py (+4/-3)
breezy/tests/per_tree/test_get_file_with_stat.py (+6/-4)
breezy/tests/per_tree/test_get_symlink_target.py (+11/-8)
breezy/tests/per_tree/test_ids.py (+2/-0)
breezy/tests/per_tree/test_inv.py (+6/-4)
breezy/tests/per_tree/test_is_executable.py (+1/-1)
breezy/tests/per_tree/test_tree.py (+18/-16)
breezy/tests/per_workingtree/__init__.py (+1/-1)
breezy/tests/per_workingtree/test_add.py (+73/-17)
breezy/tests/per_workingtree/test_add_reference.py (+1/-1)
breezy/tests/per_workingtree/test_basis_inventory.py (+7/-7)
breezy/tests/per_workingtree/test_changes_from.py (+1/-1)
breezy/tests/per_workingtree/test_commit.py (+25/-34)
breezy/tests/per_workingtree/test_merge_from_branch.py (+2/-2)
breezy/tests/per_workingtree/test_move.py (+24/-24)
breezy/tests/per_workingtree/test_pull.py (+13/-13)
breezy/tests/per_workingtree/test_rename_one.py (+22/-22)
breezy/tests/per_workingtree/test_workingtree.py (+69/-60)
breezy/tests/test__dirstate_helpers.py (+1/-2)
breezy/tests/test_branch.py (+15/-3)
breezy/tests/test_btree_index.py (+7/-6)
breezy/tests/test_bzrdir.py (+3/-3)
breezy/tests/test_commit.py (+3/-2)
breezy/tests/test_commit_merge.py (+1/-1)
breezy/tests/test_config.py (+2/-1)
breezy/tests/test_controldir.py (+8/-0)
breezy/tests/test_decorators.py (+6/-1)
breezy/tests/test_directory_service.py (+4/-3)
breezy/tests/test_dirstate.py (+10/-0)
breezy/tests/test_errors.py (+0/-97)
breezy/tests/test_foreign.py (+4/-3)
breezy/tests/test_groupcompress.py (+2/-1)
breezy/tests/test_help.py (+1/-1)
breezy/tests/test_hooks.py (+17/-4)
breezy/tests/test_index.py (+151/-118)
breezy/tests/test_inv.py (+4/-4)
breezy/tests/test_knit.py (+71/-42)
breezy/tests/test_lazy_import.py (+5/-20)
breezy/tests/test_lazy_regex.py (+7/-4)
breezy/tests/test_msgeditor.py (+1/-1)
breezy/tests/test_osutils.py (+4/-6)
breezy/tests/test_reconfigure.py (+16/-16)
breezy/tests/test_repository.py (+1/-1)
breezy/tests/test_rules.py (+9/-3)
breezy/tests/test_selftest.py (+22/-20)
breezy/tests/test_smart.py (+2/-2)
breezy/tests/test_smart_request.py (+1/-1)
breezy/tests/test_ssh_transport.py (+37/-1)
breezy/tests/test_transform.py (+44/-0)
breezy/tests/test_tree.py (+1/-1)
breezy/tests/test_version_info.py (+7/-5)
breezy/tests/test_workingtree.py (+3/-1)
breezy/tests/test_workingtree_4.py (+1/-1)
breezy/transform.py (+34/-16)
breezy/transport/sftp.py (+4/-0)
breezy/transport/ssh.py (+14/-2)
breezy/tree.py (+2/-1)
breezy/version_info_formats/__init__.py (+1/-4)
breezy/version_info_formats/format_custom.py (+15/-2)
breezy/views.py (+1/-4)
breezy/workingtree.py (+4/-13)
doc/developers/new-config-rationale.txt (+1/-1)
doc/en/release-notes/brz-3.0.txt (+22/-0)
doc/en/user-guide/index-plain.txt (+4/-4)
doc/en/user-guide/index.txt (+4/-4)
doc/ru/user-guide/index-plain.txt (+6/-6)
python3.passing (+559/-0)
tools/time_graph.py (+1/-4)
Superseded
for merging
into
lp:~jelmer/brz/matchingbzrdir
- Jelmer Vernooij: Pending requested
-
Diff: 10550 lines (+2727/-2134)126 files modified.testr.conf (+1/-1)
Makefile (+27/-8)
breezy/bisect.py (+8/-12)
breezy/branch.py (+209/-249)
breezy/builtins.py (+46/-15)
breezy/bundle/serializer/__init__.py (+2/-8)
breezy/bundle/serializer/v08.py (+1/-4)
breezy/bundle/serializer/v4.py (+1/-4)
breezy/bzr/branch.py (+53/-56)
breezy/bzr/dirstate.py (+17/-16)
breezy/bzr/inventorytree.py (+24/-26)
breezy/bzr/knitrepo.py (+32/-32)
breezy/bzr/pack_repo.py (+2/-3)
breezy/bzr/remote.py (+191/-191)
breezy/bzr/repository.py (+1/-1)
breezy/bzr/smart/branch.py (+2/-5)
breezy/bzr/smart/repository.py (+6/-24)
breezy/bzr/vf_repository.py (+81/-88)
breezy/bzr/workingtree.py (+4/-16)
breezy/bzr/workingtree_4.py (+1/-4)
breezy/clean_tree.py (+1/-4)
breezy/commands.py (+17/-17)
breezy/commit.py (+0/-9)
breezy/config.py (+25/-26)
breezy/conflicts.py (+1/-4)
breezy/decorators.py (+8/-44)
breezy/diff.py (+1/-4)
breezy/errors.py (+0/-4)
breezy/export/__init__.py (+1/-4)
breezy/foreign.py (+4/-1)
breezy/inter.py (+3/-0)
breezy/lock.py (+13/-1)
breezy/lru_cache.py (+5/-5)
breezy/memorytree.py (+5/-1)
breezy/mutabletree.py (+1/-4)
breezy/plugins/email/emailer.py (+1/-6)
breezy/plugins/fastimport/branch_updater.py (+1/-4)
breezy/plugins/fastimport/cmds.py (+3/-3)
breezy/plugins/fastimport/exporter.py (+1/-4)
breezy/plugins/fastimport/helpers.py (+9/-9)
breezy/plugins/fastimport/tests/test_generic_processor.py (+6/-9)
breezy/plugins/grep/grep.py (+3/-12)
breezy/plugins/launchpad/cmds.py (+5/-2)
breezy/plugins/launchpad/lp_api.py (+1/-4)
breezy/plugins/launchpad/lp_api_lite.py (+1/-4)
breezy/plugins/launchpad/lp_propose.py (+4/-13)
breezy/plugins/stats/cmds.py (+6/-23)
breezy/plugins/upload/cmds.py (+10/-12)
breezy/plugins/weave_fmt/workingtree.py (+3/-2)
breezy/repository.py (+16/-5)
breezy/revisionspec.py (+4/-18)
breezy/revisiontree.py (+2/-1)
breezy/switch.py (+3/-14)
breezy/tag.py (+1/-4)
breezy/tests/__init__.py (+37/-9)
breezy/tests/blackbox/__init__.py (+1/-0)
breezy/tests/blackbox/test_branch.py (+6/-6)
breezy/tests/blackbox/test_cat_revision.py (+1/-4)
breezy/tests/blackbox/test_link_tree.py (+58/-0)
breezy/tests/blackbox/test_pull.py (+9/-9)
breezy/tests/blackbox/test_repair_workingtree.py (+1/-4)
breezy/tests/blackbox/test_selftest.py (+9/-4)
breezy/tests/blackbox/test_serve.py (+1/-4)
breezy/tests/features.py (+16/-6)
breezy/tests/fixtures.py (+4/-4)
breezy/tests/matchers.py (+3/-12)
breezy/tests/per_branch/__init__.py (+11/-10)
breezy/tests/per_branch/test_branch.py (+47/-41)
breezy/tests/per_branch/test_create_checkout.py (+4/-4)
breezy/tests/per_branch/test_create_clone.py (+7/-7)
breezy/tests/per_branch/test_dotted_revno_to_revision_id.py (+22/-14)
breezy/tests/per_branch/test_get_revision_id_to_revno_map.py (+21/-15)
breezy/tests/per_branch/test_locking.py (+33/-46)
breezy/tests/per_branch/test_pull.py (+32/-32)
breezy/tests/per_branch/test_push.py (+17/-17)
breezy/tests/per_branch/test_revision_id_to_dotted_revno.py (+6/-6)
breezy/tests/per_branch/test_revision_id_to_revno.py (+5/-5)
breezy/tests/per_branch/test_sprout.py (+24/-24)
breezy/tests/per_branch/test_stacking.py (+28/-29)
breezy/tests/per_branch/test_tags.py (+69/-73)
breezy/tests/per_bzrdir/test_bzrdir.py (+41/-48)
breezy/tests/per_controldir/test_controldir.py (+252/-229)
breezy/tests/per_controldir/test_push.py (+5/-5)
breezy/tests/per_interbranch/test_fetch.py (+15/-18)
breezy/tests/per_interbranch/test_pull.py (+22/-22)
breezy/tests/per_interbranch/test_push.py (+14/-14)
breezy/tests/per_repository/test_commit_builder.py (+1/-1)
breezy/tests/per_repository/test_fetch.py (+17/-17)
breezy/tests/per_repository/test_repository.py (+67/-70)
breezy/tests/per_repository/test_revision.py (+5/-6)
breezy/tests/per_repository/test_signatures.py (+30/-31)
breezy/tests/per_repository_vf/test_refresh_data.py (+5/-2)
breezy/tests/per_tree/test_annotate_iter.py (+11/-11)
breezy/tests/per_workingtree/test_add.py (+2/-2)
breezy/tests/per_workingtree/test_basis_inventory.py (+7/-7)
breezy/tests/per_workingtree/test_commit.py (+16/-30)
breezy/tests/per_workingtree/test_merge_from_branch.py (+2/-2)
breezy/tests/per_workingtree/test_move.py (+24/-24)
breezy/tests/per_workingtree/test_pull.py (+13/-13)
breezy/tests/per_workingtree/test_rename_one.py (+22/-22)
breezy/tests/per_workingtree/test_workingtree.py (+37/-37)
breezy/tests/test_config.py (+2/-1)
breezy/tests/test_decorators.py (+6/-1)
breezy/tests/test_foreign.py (+3/-2)
breezy/tests/test_hooks.py (+1/-1)
breezy/tests/test_lazy_import.py (+5/-20)
breezy/tests/test_lazy_regex.py (+6/-3)
breezy/tests/test_osutils.py (+3/-5)
breezy/tests/test_selftest.py (+8/-6)
breezy/tests/test_smart.py (+2/-2)
breezy/tests/test_ssh_transport.py (+37/-1)
breezy/tests/test_transform.py (+44/-0)
breezy/tests/test_workingtree.py (+2/-0)
breezy/transform.py (+34/-16)
breezy/transport/sftp.py (+4/-0)
breezy/transport/ssh.py (+14/-2)
breezy/tree.py (+2/-1)
breezy/version_info_formats/__init__.py (+1/-4)
breezy/views.py (+1/-4)
breezy/workingtree.py (+3/-12)
doc/en/release-notes/brz-3.0.txt (+22/-0)
doc/en/user-guide/index-plain.txt (+3/-3)
doc/en/user-guide/index.txt (+4/-4)
doc/ru/user-guide/index-plain.txt (+6/-6)
python3.passing (+559/-0)
tools/time_graph.py (+1/-4)
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:brz