← Back to branch summary

~ubuntu-branches/ubuntu/raring/bzr-svn/raring

« back to all changes in this revision

Viewing changes to format.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-07-30 23:14:36 UTC
  • mfrom: (1.1.28 upstream) (3.3.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100730231436-po8j0ibgjn2d6hy0
Tags: 1.0.3-1
http://bugs.debian.org/572109
http://bugs.debian.org/573988
https://launchpad.net/bugs/481730
* New upstream release.
 + Provides BranchConfig._get_change_editor. Closes: #572109
 + Supports more trunk layout levels. Closes: #573988
* Bump standards version to 3.9.1.
* Mark as supporting bzr 2.2.
* Suggest bzr-rewrite rather than bzr-rebase. LP: #481730

Show diffs side-by-side

added added

removed removed

Lines of Context:
format.py
32
32
    )
33
33
 
34
34
 
35
 
def get_rich_root_format(stacked=False):
36
 
    format = format_registry.make_bzrdir('default-rich-root')
37
 
    # If the default format does not support stacking, fall back to
38
 
    # 1.9-rr. This doesn't have performance issues, since all
39
 
    # bzr versions that have 2a as default.
40
 
    if stacked and not format.get_branch_format().supports_stacking():
41
 
        return format_registry.make_bzrdir('1.9-rich-root')
42
 
    return format
43
 
 
44
 
 
45
35
class SvnControlFormat(BzrDirFormat):
46
36
    """Format for a Subversion control dir."""
47
37
    _lock_class = TransportLock
212
202
        """See BzrDirFormat.get_converter()."""
213
203
        self._check_versions()
214
204
        if format is None:
215
 
            format = get_rich_root_format()
 
205
            format = format_registry.make_bzrdir('default')
216
206
        from bzrlib.plugins.svn.workingtree import SvnCheckoutConverter
217
207
        return SvnCheckoutConverter(format)