/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

  • Committer: Vincent Ladeuil
  • Date: 2010-01-20 16:05:28 UTC
  • mto: (4973.1.1 integration)
  • Revision ID: v.ladeuil+lp@free.fr-20100120160528-5yo3fbggdp07eovc
Finish the patch based on reviews.

* bzrlib/tests/per_merger.py:
Fix line too long and spurious spaces.

* bzrlib/plugins/news_merge/tests/test_news_merge.py:
(TestFilenameMatchesConfig): Ensure that the params get updated.

* bzrlib/plugins/news_merge/__init__.py:
(filename_matches_config): Save the relevant config variable in
the hook params.
(install_hook): Wrap the hook installation so we can reuse it for
tests.

* bzrlib/plugins/news_merge/README: 
Update the instructions by pointing to the plugin help.

* bzrlib/merge.py:
(MergeHookParams): Delete spurious spaces.

* bzrlib/decorators.py:
(use_pretty_decorators): Mention that we get clearance to copy
launchpad code here (since canonical has copyrights on both code
bases).

Filename Latest Rev Last Changed Committer Comment Size
..
__init__.py 4183.7.1 16 years ago Sabin Iacob update FSF mailing address 1 KB Diff Download File
ca.crt 2929.3.13 18 years ago Vincent Ladeuil Update ssl generated files. Put the branch on the 2.3 KB Diff Download File
ca.key 2929.3.13 18 years ago Vincent Ladeuil Update ssl generated files. Put the branch on the 3.2 KB Diff Download File
File create_ssls.py 4830.2.1 16 years ago Vincent Ladeuil Fix https tests regression. * bzrlib/tests/ssl_ce 9.4 KB Diff Download File
server.crt 4830.2.1 16 years ago Vincent Ladeuil Fix https tests regression. * bzrlib/tests/ssl_ce 1.9 KB Diff Download File
server.csr 4830.2.1 16 years ago Vincent Ladeuil Fix https tests regression. * bzrlib/tests/ssl_ce 1.7 KB Diff Download File
server_with_pass.key 4830.2.1 16 years ago Vincent Ladeuil Fix https tests regression. * bzrlib/tests/ssl_ce 3.2 KB Diff Download File
server_without_pass.key 4830.2.1 16 years ago Vincent Ladeuil Fix https tests regression. * bzrlib/tests/ssl_ce 3.1 KB Diff Download File