/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

• browse files at revision 5155.1.5
• compare with another revision
• download diff
• download tarball
• view history from revision 5155.1.5

• reverse the comparison (5155.1.5 to 5200.4.3)
• stop comparing with revision 5200.4.3

Show diffs side-by-side

added

removed

bzrlib/branch.py

63

63

BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"

64

64

 

65

65

 

66

 

class Branch(bzrdir.ControlComponent):

 

66

# TODO: Maybe include checks for common corruption of newlines, etc?

 

67

 

 

68

# TODO: Some operations like log might retrieve the same revisions

 

69

# repeatedly to calculate deltas.  We could perhaps have a weakref

 

70

# cache in memory to make this faster.  In general anything can be

 

71

# cached in memory between lock and unlock operations. .. nb thats

 

72

# what the transaction identity map provides

 

73

 

 

74

 

 

75

######################################################################

 

76

# branch objects

 

77

 

 

78

class Branch(object):

67

79

    """Branch holding a history of revisions.

68

80

 

69

 

    :ivar base:

70

 

        Base directory/url of the branch; using control_url and

71

 

        control_transport is more standardized.

 

81

    base

 

82

        Base directory/url of the branch.

72

83

 

73

84

    hooks: An instance of BranchHooks.

74

85

    """

76

87

    # - RBC 20060112

77

88

    base = None

78

89

 

79

 

    @property

80

 

    def control_transport(self):

81

 

        return self._transport

82

 

 

83

 

    @property

84

 

    def user_transport(self):

85

 

        return self.bzrdir.user_transport

86

 

 

87

90

    def __init__(self, *ignored, **ignored_too):

88

91

        self.tags = self._format.make_tags(self)

89

92

        self._revision_history_cache = None

104

107

        """Activate the branch/repository from url as a fallback repository."""

105

108

        repo = self._get_fallback_repository(url)

106

109

        if repo.has_same_location(self.repository):

107

 

            raise errors.UnstackableLocationError(self.user_url, url)

 

110

            raise errors.UnstackableLocationError(self.base, url)

108

111

        self.repository.add_fallback_repository(repo)

109

112

 

110

113

    def break_lock(self):

605

608

        :param other: The branch to bind to

606

609

        :type other: Branch

607

610

        """

608

 

        raise errors.UpgradeRequired(self.user_url)

 

611

        raise errors.UpgradeRequired(self.base)

609

612

 

610

613

    def set_append_revisions_only(self, enabled):

611

614

        if not self._format.supports_set_append_revisions_only():

612

 

            raise errors.UpgradeRequired(self.user_url)

 

615

            raise errors.UpgradeRequired(self.base)

613

616

        if enabled:

614

617

            value = 'True'

615

618

        else:

663

666

    def get_old_bound_location(self):

664

667

        """Return the URL of the branch we used to be bound to

665

668

        """

666

 

        raise errors.UpgradeRequired(self.user_url)

 

669

        raise errors.UpgradeRequired(self.base)

667

670

 

668

671

    def get_commit_builder(self, parents, config=None, timestamp=None,

669

672

                           timezone=None, committer=None, revprops=None,

747

750

            stacking.

748

751

        """

749

752

        if not self._format.supports_stacking():

750

 

            raise errors.UnstackableBranchFormat(self._format, self.user_url)

 

753

            raise errors.UnstackableBranchFormat(self._format, self.base)

751

754

        # XXX: Changing from one fallback repository to another does not check

752

755

        # that all the data you need is present in the new fallback.

753

756

        # Possibly it should.

904

907

 

905

908

    def unbind(self):

906

909

        """Older format branches cannot bind or unbind."""

907

 

        raise errors.UpgradeRequired(self.user_url)

 

910

        raise errors.UpgradeRequired(self.base)

908

911

 

909

912

    def last_revision(self):

910

913

        """Return last revision id, or NULL_REVISION."""

1070

1073

        try:

1071

1074

            return urlutils.join(self.base[:-1], parent)

1072

1075

        except errors.InvalidURLJoin, e:

1073

 

            raise errors.InaccessibleParent(parent, self.user_url)

 

1076

            raise errors.InaccessibleParent(parent, self.base)

1074

1077

 

1075

1078

    def _get_parent_location(self):

1076

1079

        raise NotImplementedError(self._get_parent_location)

1575

1578

            elsewhere)

1576

1579

        :return: a branch in this format

1577

1580

        """

1578

 

        mutter('creating branch %r in %s', self, a_bzrdir.user_url)

 

1581

        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)

1579

1582

        branch_transport = a_bzrdir.get_branch_transport(self, name=name)

1580

1583

        lock_map = {

1581

1584

            'metadir': ('lock', lockdir.LockDir),

1968

1971

            if format.__class__ != self.__class__:

1969

1972

                raise AssertionError("wrong format %r found for %r" %

1970

1973

                    (format, self))

1971

 

        transport = a_bzrdir.get_branch_transport(None, name=name)

1972

1974

        try:

 

1975

            transport = a_bzrdir.get_branch_transport(None, name=name)

1973

1976

            control_files = lockable_files.LockableFiles(transport, 'lock',

1974

1977

                                                         lockdir.LockDir)

1975

1978

            return self._branch_class()(_format=self,

2173

2176

            # this format does not implement branch itself, thus the implicit

2174

2177

            # creation contract must see it as uninitializable

2175

2178

            raise errors.UninitializableFormat(self)

2176

 

        mutter('creating branch reference in %s', a_bzrdir.user_url)

 

2179

        mutter('creating branch reference in %s', a_bzrdir.transport.base)

2177

2180

        branch_transport = a_bzrdir.get_branch_transport(self, name=name)

2178

2181

        branch_transport.put_bytes('location',

2179

 

            target_branch.bzrdir.user_url)

 

2182

            target_branch.bzrdir.root_transport.base)

2180

2183

        branch_transport.put_bytes('format', self.get_format_string())

2181

2184

        branch = self.open(

2182

2185

            a_bzrdir, name, _found=True,

2304

2307

 

2305

2308

    def __str__(self):

2306

2309

        if self.name is None:

2307

 

            return '%s(%s)' % (self.__class__.__name__, self.user_url)

 

2310

            return '%s(%r)' % (self.__class__.__name__, self.base)

2308

2311

        else:

2309

 

            return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,

2310

 

                self.name)

 

2312

            return '%s(%r,%r)' % (self.__class__.__name__, self.base, self.name)

2311

2313

 

2312

2314

    __repr__ = __str__

2313

2315

 

2528

2530

        return result

2529

2531

 

2530

2532

    def get_stacked_on_url(self):

2531

 

        raise errors.UnstackableBranchFormat(self._format, self.user_url)

 

2533

        raise errors.UnstackableBranchFormat(self._format, self.base)

2532

2534

 

2533

2535

    def set_push_location(self, location):

2534

2536

        """See Branch.set_push_location."""

2724

2726

        if _mod_revision.is_null(last_revision):

2725

2727

            return

2726

2728

        if last_revision not in self._lefthand_history(revision_id):

2727

 

            raise errors.AppendRevisionsOnlyViolation(self.user_url)

 

2729

            raise errors.AppendRevisionsOnlyViolation(self.base)

2728

2730

 

2729

2731

    def _gen_revision_history(self):

2730

2732

        """Generate the revision history from last revision

2830

2832

        if branch_location is None:

2831

2833

            return Branch.reference_parent(self, file_id, path,

2832

2834

                                           possible_transports)

2833

 

        branch_location = urlutils.join(self.user_url, branch_location)

 

2835

        branch_location = urlutils.join(self.base, branch_location)

2834

2836

        return Branch.open(branch_location,

2835

2837

                           possible_transports=possible_transports)

2836

2838

 

2951

2953

    """

2952

2954

 

2953

2955

    def get_stacked_on_url(self):

2954

 

        raise errors.UnstackableBranchFormat(self._format, self.user_url)

 

2956

        raise errors.UnstackableBranchFormat(self._format, self.base)

2955

2957

 

2956

2958

 

2957

2959

######################################################################

3044

3046

        :param verbose: Requests more detailed display of what was checked,

3045

3047

            if any.

3046

3048

        """

3047

 

        note('checked branch %s format %s', self.branch.user_url,

 

3049

        note('checked branch %s format %s', self.branch.base,

3048

3050

            self.branch._format)

3049

3051

        for error in self.errors:

3050

3052

            note('found error:%s', error)

3379

3381

        if local and not bound_location:

3380

3382

            raise errors.LocalRequiresBoundBranch()

3381

3383

        master_branch = None

3382

 

        if not local and bound_location and self.source.user_url != bound_location:

 

3384

        if not local and bound_location and self.source.base != bound_location:

3383

3385

            # not pulling from master, so we need to update master.

3384

3386

            master_branch = self.target.get_master_branch(possible_transports)

3385

3387

            master_branch.lock_write()

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0