← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/branch.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-15 11:36:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5975.
  • Revision ID: v.ladeuil+lp@free.fr-20110615113605-p7zyyfry9wy1hquc
https://launchpad.net/bugs/788000
Make ContentConflict resolution more robust

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/branch.py
32
32
class BzrBranch4(FullHistoryBzrBranch):
33
33
    """Branch format 4."""
34
34
 
35
 
    def _get_checkout_format(self, lightweight=False):
 
35
    def _get_checkout_format(self):
36
36
        """Return the most suitable metadir for a checkout of this branch.
37
37
        """
38
38
        from bzrlib.plugins.weave_fmt.repository import RepositoryFormat7
39
39
        from bzrlib.bzrdir import BzrDirMetaFormat1
40
40
        format = BzrDirMetaFormat1()
41
 
        if lightweight:
42
 
            format.set_branch_format(self._format)
43
 
            format.repository_format = self.bzrdir._format.repository_format
44
 
        else:
45
 
            format.repository_format = RepositoryFormat7()
 
41
        format.repository_format = RepositoryFormat7()
46
42
        return format
47
43
 
48
44
    def unbind(self):
74
70
    It does not support binding.
75
71
    """
76
72
 
77
 
    def initialize(self, a_bzrdir, name=None, repository=None,
78
 
                   append_revisions_only=None):
 
73
    def initialize(self, a_bzrdir, name=None, repository=None):
79
74
        """Create a branch of this format in a_bzrdir.
80
75
 
81
76
        :param a_bzrdir: The bzrdir to initialize the branch in
82
77
        :param name: Name of colocated branch to create, if any
83
78
        :param repository: Repository for this branch (unused)
84
79
        """
85
 
        if append_revisions_only:
86
 
            raise errors.UpgradeRequired(a_bzrdir.user_url)
87
80
        if repository is not None:
88
81
            raise NotImplementedError(
89
82
                "initialize(repository=<not None>) on %r" % (self,))