/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 bzrlib/branch.py

  • Committer: Aaron Bentley
  • Date: 2010-04-26 23:38:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5186.
  • Revision ID: aaron@aaronbentley.com-20100426233810-ktj5qkyowq33iuya
Restore now-needed branch import.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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):
417
420
            * 'include' - the stop revision is the last item in the result
418
421
            * 'with-merges' - include the stop revision and all of its
419
422
              merged revisions in the result
420
 
            * 'with-merges-without-common-ancestry' - filter out revisions 
421
 
              that are in both ancestries
422
423
        :param direction: either 'reverse' or 'forward':
423
424
            * reverse means return the start_revision_id first, i.e.
424
425
              start at the most recent revision and go backwards in history
455
456
            stop_revision_id, stop_rule)
456
457
        # Make sure we don't return revisions that are not part of the
457
458
        # start_revision_id ancestry.
458
 
        filtered = self._filter_start_non_ancestors(filtered)
 
459
        filtered = self._filter_non_ancestors(filtered)
459
460
        if direction == 'reverse':
460
461
            return filtered
461
462
        if direction == 'forward':
498
499
                       node.end_of_merge)
499
500
                if rev_id == stop_revision_id:
500
501
                    return
501
 
        elif stop_rule == 'with-merges-without-common-ancestry':
502
 
            # We want to exclude all revisions that are already part of the
503
 
            # stop_revision_id ancestry.
504
 
            graph = self.repository.get_graph()
505
 
            ancestors = graph.find_unique_ancestors(start_revision_id,
506
 
                                                    [stop_revision_id])
507
 
            for node in rev_iter:
508
 
                rev_id = node.key[-1]
509
 
                if rev_id not in ancestors:
510
 
                    continue
511
 
                yield (rev_id, node.merge_depth, node.revno,
512
 
                       node.end_of_merge)
513
502
        elif stop_rule == 'with-merges':
514
503
            stop_rev = self.repository.get_revision(stop_revision_id)
515
504
            if stop_rev.parent_ids:
538
527
        else:
539
528
            raise ValueError('invalid stop_rule %r' % stop_rule)
540
529
 
541
 
    def _filter_start_non_ancestors(self, rev_iter):
 
530
    def _filter_non_ancestors(self, rev_iter):
542
531
        # If we started from a dotted revno, we want to consider it as a tip
543
532
        # and don't want to yield revisions that are not part of its
544
533
        # ancestry. Given the order guaranteed by the merge sort, we will see
605
594
        :param other: The branch to bind to
606
595
        :type other: Branch
607
596
        """
608
 
        raise errors.UpgradeRequired(self.user_url)
 
597
        raise errors.UpgradeRequired(self.base)
609
598
 
610
599
    def set_append_revisions_only(self, enabled):
611
600
        if not self._format.supports_set_append_revisions_only():
612
 
            raise errors.UpgradeRequired(self.user_url)
 
601
            raise errors.UpgradeRequired(self.base)
613
602
        if enabled:
614
603
            value = 'True'
615
604
        else:
663
652
    def get_old_bound_location(self):
664
653
        """Return the URL of the branch we used to be bound to
665
654
        """
666
 
        raise errors.UpgradeRequired(self.user_url)
 
655
        raise errors.UpgradeRequired(self.base)
667
656
 
668
657
    def get_commit_builder(self, parents, config=None, timestamp=None,
669
658
                           timezone=None, committer=None, revprops=None,
747
736
            stacking.
748
737
        """
749
738
        if not self._format.supports_stacking():
750
 
            raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
739
            raise errors.UnstackableBranchFormat(self._format, self.base)
751
740
        # XXX: Changing from one fallback repository to another does not check
752
741
        # that all the data you need is present in the new fallback.
753
742
        # Possibly it should.
904
893
 
905
894
    def unbind(self):
906
895
        """Older format branches cannot bind or unbind."""
907
 
        raise errors.UpgradeRequired(self.user_url)
 
896
        raise errors.UpgradeRequired(self.base)
908
897
 
909
898
    def last_revision(self):
910
899
        """Return last revision id, or NULL_REVISION."""
1070
1059
        try:
1071
1060
            return urlutils.join(self.base[:-1], parent)
1072
1061
        except errors.InvalidURLJoin, e:
1073
 
            raise errors.InaccessibleParent(parent, self.user_url)
 
1062
            raise errors.InaccessibleParent(parent, self.base)
1074
1063
 
1075
1064
    def _get_parent_location(self):
1076
1065
        raise NotImplementedError(self._get_parent_location)
1575
1564
            elsewhere)
1576
1565
        :return: a branch in this format
1577
1566
        """
1578
 
        mutter('creating branch %r in %s', self, a_bzrdir.user_url)
 
1567
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1579
1568
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1580
1569
        lock_map = {
1581
1570
            'metadir': ('lock', lockdir.LockDir),
1968
1957
            if format.__class__ != self.__class__:
1969
1958
                raise AssertionError("wrong format %r found for %r" %
1970
1959
                    (format, self))
1971
 
        transport = a_bzrdir.get_branch_transport(None, name=name)
1972
1960
        try:
 
1961
            transport = a_bzrdir.get_branch_transport(None, name=name)
1973
1962
            control_files = lockable_files.LockableFiles(transport, 'lock',
1974
1963
                                                         lockdir.LockDir)
1975
1964
            return self._branch_class()(_format=self,
2173
2162
            # this format does not implement branch itself, thus the implicit
2174
2163
            # creation contract must see it as uninitializable
2175
2164
            raise errors.UninitializableFormat(self)
2176
 
        mutter('creating branch reference in %s', a_bzrdir.user_url)
 
2165
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
2177
2166
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2178
2167
        branch_transport.put_bytes('location',
2179
 
            target_branch.bzrdir.user_url)
 
2168
            target_branch.bzrdir.root_transport.base)
2180
2169
        branch_transport.put_bytes('format', self.get_format_string())
2181
2170
        branch = self.open(
2182
2171
            a_bzrdir, name, _found=True,
2304
2293
 
2305
2294
    def __str__(self):
2306
2295
        if self.name is None:
2307
 
            return '%s(%s)' % (self.__class__.__name__, self.user_url)
 
2296
            return '%s(%r)' % (self.__class__.__name__, self.base)
2308
2297
        else:
2309
 
            return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2310
 
                self.name)
 
2298
            return '%s(%r,%r)' % (self.__class__.__name__, self.base, self.name)
2311
2299
 
2312
2300
    __repr__ = __str__
2313
2301
 
2528
2516
        return result
2529
2517
 
2530
2518
    def get_stacked_on_url(self):
2531
 
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
2519
        raise errors.UnstackableBranchFormat(self._format, self.base)
2532
2520
 
2533
2521
    def set_push_location(self, location):
2534
2522
        """See Branch.set_push_location."""
2724
2712
        if _mod_revision.is_null(last_revision):
2725
2713
            return
2726
2714
        if last_revision not in self._lefthand_history(revision_id):
2727
 
            raise errors.AppendRevisionsOnlyViolation(self.user_url)
 
2715
            raise errors.AppendRevisionsOnlyViolation(self.base)
2728
2716
 
2729
2717
    def _gen_revision_history(self):
2730
2718
        """Generate the revision history from last revision
2830
2818
        if branch_location is None:
2831
2819
            return Branch.reference_parent(self, file_id, path,
2832
2820
                                           possible_transports)
2833
 
        branch_location = urlutils.join(self.user_url, branch_location)
 
2821
        branch_location = urlutils.join(self.base, branch_location)
2834
2822
        return Branch.open(branch_location,
2835
2823
                           possible_transports=possible_transports)
2836
2824
 
2951
2939
    """
2952
2940
 
2953
2941
    def get_stacked_on_url(self):
2954
 
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
2942
        raise errors.UnstackableBranchFormat(self._format, self.base)
2955
2943
 
2956
2944
 
2957
2945
######################################################################
3044
3032
        :param verbose: Requests more detailed display of what was checked,
3045
3033
            if any.
3046
3034
        """
3047
 
        note('checked branch %s format %s', self.branch.user_url,
 
3035
        note('checked branch %s format %s', self.branch.base,
3048
3036
            self.branch._format)
3049
3037
        for error in self.errors:
3050
3038
            note('found error:%s', error)
3379
3367
        if local and not bound_location:
3380
3368
            raise errors.LocalRequiresBoundBranch()
3381
3369
        master_branch = None
3382
 
        if not local and bound_location and self.source.user_url != bound_location:
 
3370
        if not local and bound_location and self.source.base != bound_location:
3383
3371
            # not pulling from master, so we need to update master.
3384
3372
            master_branch = self.target.get_master_branch(possible_transports)
3385
3373
            master_branch.lock_write()