/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: 2009-12-15 20:32:34 UTC
  • mto: (4905.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4906.
  • Revision ID: v.ladeuil+lp@free.fr-20091215203234-d8br6xqfq6pec40z
Move the _warn_if_deprecated call from repo.__init__ to
repo.lock_{read,write} so that branch.lock_{read,write} can call it. This
makes it possible to access locations.conf and branch.conf.

* bzrlib/tests/blackbox/test_exceptions.py:
(TestDeprecationWarning): Test that the suppress_warning
configuration variable is taken into account.

* bzrlib/repository.py:
(Repository.__init__): Delete very old and obsolete
comments. Don't warn about deprecations yet.
(Repository.lock_write, Repository.lock_read): The repo is about
to be locked, check deprecation.
(Repository._warn_if_deprecated): Use the branch config if
available or the global one othewrwise and check for the
suppress_warning variable.

* bzrlib/remote.py:
(RemoteRepository._warn_if_deprecated): Nothing to do here. 

* bzrlib/repofmt/pack_repo.py:
(KnitPackRepository._warn_if_deprecated): Delegate to base class
if needed.

* bzrlib/branch.py:
(BzrBranch.lock_write, BzrBranch.lock_read): Check repo
deprecation.

* bzrlib/help_topics/en/configuration.txt:
Fix the variable name and its description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
1
 
#!/usr/bin/env python
2
 
 
3
 
from info import *
4
 
 
5
 
if __name__ == '__main__':
6
 
    from distutils.core import setup
7
 
    version = bzr_plugin_version[:3]
8
 
    version_string = ".".join([str(x) for x in version])
9
 
 
10
 
    setup(name='bzr-git',
11
 
          description='Support for Git branches in Bazaar',
12
 
          keywords='plugin bzr git bazaar',
13
 
          version=version_string,
14
 
          url='http://bazaar-vcs.org/BzrForeignBranches/Git',
15
 
          license='GPL',
16
 
          maintainer='Jelmer Vernooij',
17
 
          maintainer_email='jelmer@samba.org',
18
 
          long_description="""
19
 
          This plugin adds limited support for checking out and viewing
20
 
          Git branches in Bazaar.
21
 
          """,
22
 
          package_dir={'bzrlib.plugins.git':'.'},
23
 
          packages=['bzrlib.plugins.git',
24
 
                    'bzrlib.plugins.git.tests'],
25
 
          scripts=['bzr-receive-pack', 'bzr-upload-pack'],
26
 
          )