/brz/remove-bazaar

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 bzrlib/externalcommand.py

  • Committer: Vincent Ladeuil
  • Date: 2010-01-20 16:05:28 UTC
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • 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).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/externalcommand.py
20
20
 
21
21
 
22
22
import os
 
23
import sys
23
24
 
24
25
from bzrlib.commands import Command
 
26
from bzrlib.osutils import pathjoin
25
27
 
26
28
 
27
29
class ExternalCommand(Command):