/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
..
launchpad 1668.1.8 19 years ago Martin Pool Merge register-branch plugin into default plugins Diff
netrc_credential_store 3757.3.2 17 years ago Vincent Ladeuil Add a credential store for '.netrc'. * plugins/ne Diff
news_merge 4869.3.27 15 years ago Andrew Bennetts Move news_merge plugin from contrib to bzrlib/plug Diff
__init__.py 4183.7.1 16 years ago Sabin Iacob update FSF mailing address 771 bytes Diff Download File