/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.8 KB Diff Download File
test_branch.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 1.5 KB Diff Download File
test_cat.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 2 KB Diff Download File
test_checkout.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 1.4 KB Diff Download File
test_commit.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 2.5 KB Diff Download File
test_init.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 1.2 KB Diff Download File
test_init_repository.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 1.3 KB Diff Download File
test_merge.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 1.4 KB Diff Download File
test_missing.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 1.4 KB Diff Download File
test_pull.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 2 KB Diff Download File
test_push.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 1.6 KB Diff Download File
test_update.py 4900.1.6 15 years ago Andrew Bennetts Fix bzrlib.test.commands.*; they need to use 'run_ 1.5 KB Diff Download File