To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to breezy/identitymap.py
- Committer: Vincent Ladeuil
- Date: 2019-06-18 11:21:15 UTC
- mfrom: (7290.1.31 work)
- mto: This revision was merged to the branch mainline in revision 7351.
- Revision ID: v.ladeuil+brz@free.fr-20190618112115-578pnbegj3bnc6pa
Merge 3.0 resolving conflicts.
- files added:
- .coveragerc
- breezy/archive
- breezy/bzr
- breezy/git
- breezy/git/notes
- breezy/git/tests
- breezy/plugins/bash_completion
- breezy/plugins/bash_completion/tests
- breezy/plugins/changelog_merge
- breezy/plugins/changelog_merge/tests
- breezy/plugins/commitfromnews
- breezy/plugins/commitfromnews/tests
- breezy/plugins/cvs
- breezy/plugins/darcs
- breezy/plugins/email
- breezy/plugins/email/tests
- breezy/plugins/fastimport
- breezy/plugins/fastimport/doc
- breezy/plugins/fastimport/processors
- breezy/plugins/fastimport/tests
- breezy/plugins/mtn
- breezy/plugins/po_merge
- breezy/plugins/po_merge/tests
- breezy/plugins/propose
- breezy/plugins/quilt
- breezy/plugins/quilt/tests
- breezy/plugins/repodebug
- breezy/plugins/repodebug/tests
- breezy/plugins/stats
- breezy/plugins/upload
- breezy/plugins/upload/tests
- breezy/plugins/weave_fmt
- breezy/tests/per_bzrdir
- breezy/tests/per_repository_vf
- doc/developers/api
- doc/developers/plans
- doc/developers/plans/performance
- doc/developers/proposals
- po
- files removed:
- bzr.ico
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/export
- bzrlib/repofmt
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests/ftp_server
- bzrlib/transport/ftp
- bzrlib/util/configobj
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- contrib/zsh
- doc/es
- doc/es/_static
- doc/es/_static/es
- doc/es/_templates
- doc/es/mini-tutorial
- doc/es/quick-reference
- doc/es/user-guide
- doc/ja
- doc/ja/_static
- doc/ja/_templates
- doc/ja/mini-tutorial
- doc/ja/tutorials
- doc/ja/upgrade-guide
- doc/ja/user-guide
- doc/ja/user-guide/images
- doc/ja/user-reference
- doc/ru
- doc/ru/_static
- doc/ru/_static/ru
- doc/ru/_templates
- doc/ru/mini-tutorial
- doc/ru/quick-reference
- doc/ru/tutorials
- doc/ru/user-guide
- doc/ru/user-guide/images
- files renamed:
- README => README.rst
- apport/bzr-crashdb.conf => apport/brz-crashdb.conf
- apport/source_bzr.py => apport/source_brz.py
- bzrlib/ => breezy/
- bzrlib/export/tar_exporter.py => breezy/archive/tar.py
- bzrlib/export/zip_exporter.py => breezy/archive/zip.py
- bzrlib/_btree_serializer_py.py => breezy/bzr/_btree_serializer_py.py
- bzrlib/_btree_serializer_pyx.pyx => breezy/bzr/_btree_serializer_pyx.pyx
- bzrlib/_chk_map_py.py => breezy/bzr/_chk_map_py.py
- bzrlib/_chk_map_pyx.pyx => breezy/bzr/_chk_map_pyx.pyx
- bzrlib/_dirstate_helpers_py.py => breezy/bzr/_dirstate_helpers_py.py
- bzrlib/_dirstate_helpers_pyx.h => breezy/bzr/_dirstate_helpers_pyx.h
- bzrlib/_dirstate_helpers_pyx.pyx => breezy/bzr/_dirstate_helpers_pyx.pyx
- bzrlib/_groupcompress_py.py => breezy/bzr/_groupcompress_py.py
- bzrlib/_groupcompress_pyx.pyx => breezy/bzr/_groupcompress_pyx.pyx
- bzrlib/_knit_load_data_py.py => breezy/bzr/_knit_load_data_py.py
- bzrlib/_knit_load_data_pyx.pyx => breezy/bzr/_knit_load_data_pyx.pyx
- bzrlib/btree_index.py => breezy/bzr/btree_index.py
- bzrlib/bzrdir.py => breezy/bzr/bzrdir.py
- bzrlib/chk_map.py => breezy/bzr/chk_map.py
- bzrlib/chk_serializer.py => breezy/bzr/chk_serializer.py
- bzrlib/delta.h => breezy/bzr/delta.h
- bzrlib/diff-delta.c => breezy/bzr/diff-delta.c
- bzrlib/dirstate.py => breezy/bzr/dirstate.py
- bzrlib/fetch.py => breezy/bzr/fetch.py
- bzrlib/generate_ids.py => breezy/bzr/generate_ids.py
- bzrlib/groupcompress.py => breezy/bzr/groupcompress.py
- bzrlib/repofmt/groupcompress_repo.py => breezy/bzr/groupcompress_repo.py
- bzrlib/index.py => breezy/bzr/index.py
- bzrlib/inventory.py => breezy/bzr/inventory.py
- bzrlib/inventory_delta.py => breezy/bzr/inventory_delta.py
- bzrlib/knit.py => breezy/bzr/knit.py
- bzrlib/repofmt/knitrepo.py => breezy/bzr/knitrepo.py
- bzrlib/pack.py => breezy/bzr/pack.py
- bzrlib/repofmt/pack_repo.py => breezy/bzr/pack_repo.py
- bzrlib/remote.py => breezy/bzr/remote.py
- bzrlib/serializer.py => breezy/bzr/serializer.py
- bzrlib/smart/ => breezy/bzr/smart/
- bzrlib/testament.py => breezy/bzr/testament.py
- bzrlib/textinv.py => breezy/bzr/textinv.py
- bzrlib/versionedfile.py => breezy/bzr/versionedfile.py
- bzrlib/weave.py => breezy/bzr/weave.py
- bzrlib/weavefile.py => breezy/bzr/weavefile.py
- bzrlib/workingtree_4.py => breezy/bzr/workingtree_4.py
- bzrlib/xml5.py => breezy/bzr/xml5.py
- bzrlib/xml6.py => breezy/bzr/xml6.py
- bzrlib/xml7.py => breezy/bzr/xml7.py
- bzrlib/xml8.py => breezy/bzr/xml8.py
- bzrlib/xml_serializer.py => breezy/bzr/xml_serializer.py
- bzrlib/sign_my_commits.py => breezy/commit_signature_commands.py
- bzrlib/doc_generate/sphinx_conf.py => breezy/doc_generate/conf.py
- bzrlib/export/__init__.py => breezy/export.py
- bzrlib/repofmt/weaverepo.py => breezy/plugins/weave_fmt/repository.py
- bzrlib/store/ => breezy/plugins/weave_fmt/store/
- bzrlib/store/versioned/__init__.py => breezy/plugins/weave_fmt/store/versioned.py
- bzrlib/tests/test_store.py => breezy/plugins/weave_fmt/test_store.py
- bzrlib/xml4.py => breezy/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_bzrdir/ => breezy/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => breezy/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_bzrdir_colo/ => breezy/tests/per_controldir_colo/
- bzrlib/tests/per_repository/test_is_write_locked.py => breezy/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => breezy/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => breezy/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => breezy/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => breezy/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => breezy/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => breezy/tests/per_repository_vf/test_merge_directive.py
- bzrlib/tests/per_tree/test_inv.py => breezy/tests/per_tree/test_symlinks.py
- bzr => brz
- contrib/bash/bzrbashprompt.sh => contrib/bash/brzbashprompt.sh
- contrib/bzr_access => contrib/brz_access
- contrib/emacs/bzr-mode.el => contrib/emacs/brz-mode.el
- doc/developers/_static/bzr-doc.css => doc/developers/_static/brz-doc.css
- doc/developers/plans.txt => doc/developers/plans/index.txt
- doc/developers/add.txt => doc/developers/plans/performance/add.txt
- doc/developers/annotate.txt => doc/developers/plans/performance/annotate.txt
- doc/developers/bundle-creation.txt => doc/developers/plans/performance/bundle-creation.txt
- doc/developers/commit.txt => doc/developers/plans/performance/commit.txt
- doc/developers/diff.txt => doc/developers/plans/performance/diff.txt
- doc/developers/directory-fingerprints.txt => doc/developers/plans/performance/directory-fingerprints.txt
- doc/developers/gc.txt => doc/developers/plans/performance/gc.txt
- doc/developers/incremental-push-pull.txt => doc/developers/plans/performance/incremental-push-pull.txt
- doc/developers/initial-push-pull.txt => doc/developers/plans/performance/initial-push-pull.txt
- doc/developers/merge-scaling.txt => doc/developers/plans/performance/merge-scaling.txt
- doc/developers/missing.txt => doc/developers/plans/performance/missing.txt
- doc/developers/performance-use-case-analysis.txt => doc/developers/plans/performance/performance-use-case-analysis.txt
- doc/developers/planned-change-integration.txt => doc/developers/plans/performance/planned-change-integration.txt
- doc/developers/planned-performance-changes.txt => doc/developers/plans/performance/planned-performance-changes.txt
- doc/developers/revert.txt => doc/developers/plans/performance/revert.txt
- doc/developers/performance-roadmap.txt => doc/developers/plans/performance/roadmap.txt
- doc/developers/status.txt => doc/developers/plans/performance/status.txt
- doc/developers/uncommit.txt => doc/developers/plans/performance/uncommit.txt
- doc/developers/update.txt => doc/developers/plans/performance/update.txt
- doc/developers/tortoise-strategy.txt => doc/developers/plans/tortoise-strategy.txt
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/_static/en/brz-en-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/_static/en/brz-en-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/_static/en/brz-en-quick-reference.svg
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- doc/en/tutorials/using_bazaar_with_launchpad.txt => doc/en/tutorials/using_breezy_with_launchpad.txt
- doc/en/user-guide/bazaar_workflows.txt => doc/en/user-guide/breezy_workflows.txt
- doc/en/user-guide/configuring_bazaar.txt => doc/en/user-guide/configuring_breezy.txt
- doc/en/user-guide/installing_bazaar.txt => doc/en/user-guide/installing_breezy.txt
- doc/en/user-guide/introducing_bazaar.txt => doc/en/user-guide/introducing_breezy.txt
- tools/bzr_epydoc => tools/brz_epydoc
- tools/bzr_epydoc_uid.py => tools/brz_epydoc_uid.py
- tools/win32/bazaar.url => tools/win32/breezy.url
- tools/win32/bzr-win32-bdist-postinstall.py => tools/win32/brz-win32-bdist-postinstall.py
- tools/win32/bzr.iss.cog => tools/win32/brz.iss.cog
- tools/win32/bzr_postinstall.py => tools/win32/brz_postinstall.py
- tools/win32/start_bzr.bat => tools/win32/start_brz.bat
- files modified:
- .bzrignore
added
removed
breezy/identitymap.py
