/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 setup.py

  • Committer: Vincent Ladeuil
  • Date: 2007-09-18 20:04:21 UTC
  • mto: (2885.1.1 140432)
  • mto: This revision was merged to the branch mainline in revision 2886.
  • Revision ID: v.ladeuil+lp@free.fr-20070918200421-9e5bkyohebe2h0eg
Add tests for commit, reuse master branch transport.

* bzrlib/workingtree.py:
(WorkingTree.pull): Add a possible_transports parameter, forward
it to branch.pull.

* bzrlib/branch.py:
(Branch.pull, BzrBranch.pull, BzrBranch5.pull): Add a
possible_transports parameter.
(BzrBranch5.pull): Make master branch transport added to
possible_transports

* bzrlib/tests/commands/test_commit.py: 
New file testing against multiple connections during commit.

* bzrlib/builtins.py:
(cmd_pull.run): Allows master branch transports to be reused.
(cmd_commit): 'fixes' is a ListOption, its default value should
be [].


* bzrlib/tests/commands/test_pull.py: 
Fix import statements.
(TestPull.test_pull_with_bound_branch): New test.

* bzrlib/tests/commands/__init__.py:
(test_suite): Add test_commit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
1
 
#!/usr/bin/env python
2
 
 
3
 
from distutils.core import setup
4
 
 
5
 
setup(name='bzr-git',
6
 
      description='Support for Git branches in Bazaar',
7
 
      keywords='plugin bzr git bazaar',
8
 
      version='0.1',
9
 
      url='http://bazaar-vcs.org/BzrForeignBranches/Git',
10
 
      license='GPL',
11
 
      author='Robert Collins',
12
 
      author_email='robertc@robertcollins.net',
13
 
      long_description="""
14
 
      This plugin adds limited support for checking out and viewing 
15
 
      Git branches in Bazaar.
16
 
      """,
17
 
      package_dir={'bzrlib.plugins.git':'.'},
18
 
      packages=['bzrlib.plugins.git']
19
 
      )