/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

Only chown() the .bzr.log when creating it, fixing NEWS entry to put it under 2.2b3

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):
283
286
        new_history.reverse()
284
287
        return new_history
285
288
 
286
 
    def lock_write(self, token=None):
287
 
        """Lock the branch for write operations.
288
 
 
289
 
        :param token: A token to permit reacquiring a previously held and
290
 
            preserved lock.
291
 
        :return: A BranchWriteLockResult.
292
 
        """
 
289
    def lock_write(self):
293
290
        raise NotImplementedError(self.lock_write)
294
291
 
295
292
    def lock_read(self):
296
 
        """Lock the branch for read operations.
297
 
 
298
 
        :return: An object with an unlock method which will release the lock
299
 
            obtained.
300
 
        """
301
293
        raise NotImplementedError(self.lock_read)
302
294
 
303
295
    def unlock(self):
428
420
            * 'include' - the stop revision is the last item in the result
429
421
            * 'with-merges' - include the stop revision and all of its
430
422
              merged revisions in the result
431
 
            * 'with-merges-without-common-ancestry' - filter out revisions 
432
 
              that are in both ancestries
433
423
        :param direction: either 'reverse' or 'forward':
434
424
            * reverse means return the start_revision_id first, i.e.
435
425
              start at the most recent revision and go backwards in history
466
456
            stop_revision_id, stop_rule)
467
457
        # Make sure we don't return revisions that are not part of the
468
458
        # start_revision_id ancestry.
469
 
        filtered = self._filter_start_non_ancestors(filtered)
 
459
        filtered = self._filter_non_ancestors(filtered)
470
460
        if direction == 'reverse':
471
461
            return filtered
472
462
        if direction == 'forward':
509
499
                       node.end_of_merge)
510
500
                if rev_id == stop_revision_id:
511
501
                    return
512
 
        elif stop_rule == 'with-merges-without-common-ancestry':
513
 
            # We want to exclude all revisions that are already part of the
514
 
            # stop_revision_id ancestry.
515
 
            graph = self.repository.get_graph()
516
 
            ancestors = graph.find_unique_ancestors(start_revision_id,
517
 
                                                    [stop_revision_id])
518
 
            for node in rev_iter:
519
 
                rev_id = node.key[-1]
520
 
                if rev_id not in ancestors:
521
 
                    continue
522
 
                yield (rev_id, node.merge_depth, node.revno,
523
 
                       node.end_of_merge)
524
502
        elif stop_rule == 'with-merges':
525
503
            stop_rev = self.repository.get_revision(stop_revision_id)
526
504
            if stop_rev.parent_ids:
549
527
        else:
550
528
            raise ValueError('invalid stop_rule %r' % stop_rule)
551
529
 
552
 
    def _filter_start_non_ancestors(self, rev_iter):
 
530
    def _filter_non_ancestors(self, rev_iter):
553
531
        # If we started from a dotted revno, we want to consider it as a tip
554
532
        # and don't want to yield revisions that are not part of its
555
533
        # ancestry. Given the order guaranteed by the merge sort, we will see
616
594
        :param other: The branch to bind to
617
595
        :type other: Branch
618
596
        """
619
 
        raise errors.UpgradeRequired(self.user_url)
 
597
        raise errors.UpgradeRequired(self.base)
620
598
 
621
599
    def set_append_revisions_only(self, enabled):
622
600
        if not self._format.supports_set_append_revisions_only():
623
 
            raise errors.UpgradeRequired(self.user_url)
 
601
            raise errors.UpgradeRequired(self.base)
624
602
        if enabled:
625
603
            value = 'True'
626
604
        else:
674
652
    def get_old_bound_location(self):
675
653
        """Return the URL of the branch we used to be bound to
676
654
        """
677
 
        raise errors.UpgradeRequired(self.user_url)
 
655
        raise errors.UpgradeRequired(self.base)
678
656
 
679
657
    def get_commit_builder(self, parents, config=None, timestamp=None,
680
658
                           timezone=None, committer=None, revprops=None,
758
736
            stacking.
759
737
        """
760
738
        if not self._format.supports_stacking():
761
 
            raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
739
            raise errors.UnstackableBranchFormat(self._format, self.base)
762
740
        # XXX: Changing from one fallback repository to another does not check
763
741
        # that all the data you need is present in the new fallback.
764
742
        # Possibly it should.
915
893
 
916
894
    def unbind(self):
917
895
        """Older format branches cannot bind or unbind."""
918
 
        raise errors.UpgradeRequired(self.user_url)
 
896
        raise errors.UpgradeRequired(self.base)
919
897
 
920
898
    def last_revision(self):
921
899
        """Return last revision id, or NULL_REVISION."""
1081
1059
        try:
1082
1060
            return urlutils.join(self.base[:-1], parent)
1083
1061
        except errors.InvalidURLJoin, e:
1084
 
            raise errors.InaccessibleParent(parent, self.user_url)
 
1062
            raise errors.InaccessibleParent(parent, self.base)
1085
1063
 
1086
1064
    def _get_parent_location(self):
1087
1065
        raise NotImplementedError(self._get_parent_location)
1586
1564
            elsewhere)
1587
1565
        :return: a branch in this format
1588
1566
        """
1589
 
        mutter('creating branch %r in %s', self, a_bzrdir.user_url)
 
1567
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1590
1568
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1591
1569
        lock_map = {
1592
1570
            'metadir': ('lock', lockdir.LockDir),
1979
1957
            if format.__class__ != self.__class__:
1980
1958
                raise AssertionError("wrong format %r found for %r" %
1981
1959
                    (format, self))
1982
 
        transport = a_bzrdir.get_branch_transport(None, name=name)
1983
1960
        try:
 
1961
            transport = a_bzrdir.get_branch_transport(None, name=name)
1984
1962
            control_files = lockable_files.LockableFiles(transport, 'lock',
1985
1963
                                                         lockdir.LockDir)
1986
1964
            return self._branch_class()(_format=self,
2184
2162
            # this format does not implement branch itself, thus the implicit
2185
2163
            # creation contract must see it as uninitializable
2186
2164
            raise errors.UninitializableFormat(self)
2187
 
        mutter('creating branch reference in %s', a_bzrdir.user_url)
 
2165
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
2188
2166
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
2189
2167
        branch_transport.put_bytes('location',
2190
 
            target_branch.bzrdir.user_url)
 
2168
            target_branch.bzrdir.root_transport.base)
2191
2169
        branch_transport.put_bytes('format', self.get_format_string())
2192
2170
        branch = self.open(
2193
2171
            a_bzrdir, name, _found=True,
2276
2254
    _legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2277
2255
 
2278
2256
 
2279
 
class BranchWriteLockResult(object):
2280
 
    """The result of write locking a branch.
2281
 
 
2282
 
    :ivar branch_token: The token obtained from the underlying branch lock, or
2283
 
        None.
2284
 
    :ivar unlock: A callable which will unlock the lock.
2285
 
    """
2286
 
 
2287
 
    def __init__(self, unlock, branch_token):
2288
 
        self.branch_token = branch_token
2289
 
        self.unlock = unlock
2290
 
 
2291
 
 
2292
2257
class BzrBranch(Branch, _RelockDebugMixin):
2293
2258
    """A branch stored in the actual filesystem.
2294
2259
 
2328
2293
 
2329
2294
    def __str__(self):
2330
2295
        if self.name is None:
2331
 
            return '%s(%s)' % (self.__class__.__name__, self.user_url)
 
2296
            return '%s(%r)' % (self.__class__.__name__, self.base)
2332
2297
        else:
2333
 
            return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2334
 
                self.name)
 
2298
            return '%s(%r,%r)' % (self.__class__.__name__, self.base, self.name)
2335
2299
 
2336
2300
    __repr__ = __str__
2337
2301
 
2348
2312
        return self.control_files.is_locked()
2349
2313
 
2350
2314
    def lock_write(self, token=None):
2351
 
        """Lock the branch for write operations.
2352
 
 
2353
 
        :param token: A token to permit reacquiring a previously held and
2354
 
            preserved lock.
2355
 
        :return: A BranchWriteLockResult.
2356
 
        """
2357
2315
        if not self.is_locked():
2358
2316
            self._note_lock('w')
2359
2317
        # All-in-one needs to always unlock/lock.
2365
2323
        else:
2366
2324
            took_lock = False
2367
2325
        try:
2368
 
            return BranchWriteLockResult(self.unlock,
2369
 
                self.control_files.lock_write(token=token))
 
2326
            return self.control_files.lock_write(token=token)
2370
2327
        except:
2371
2328
            if took_lock:
2372
2329
                self.repository.unlock()
2373
2330
            raise
2374
2331
 
2375
2332
    def lock_read(self):
2376
 
        """Lock the branch for read operations.
2377
 
 
2378
 
        :return: An object with an unlock method which will release the lock
2379
 
            obtained.
2380
 
        """
2381
2333
        if not self.is_locked():
2382
2334
            self._note_lock('r')
2383
2335
        # All-in-one needs to always unlock/lock.
2390
2342
            took_lock = False
2391
2343
        try:
2392
2344
            self.control_files.lock_read()
2393
 
            return self
2394
2345
        except:
2395
2346
            if took_lock:
2396
2347
                self.repository.unlock()
2565
2516
        return result
2566
2517
 
2567
2518
    def get_stacked_on_url(self):
2568
 
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
2519
        raise errors.UnstackableBranchFormat(self._format, self.base)
2569
2520
 
2570
2521
    def set_push_location(self, location):
2571
2522
        """See Branch.set_push_location."""
2761
2712
        if _mod_revision.is_null(last_revision):
2762
2713
            return
2763
2714
        if last_revision not in self._lefthand_history(revision_id):
2764
 
            raise errors.AppendRevisionsOnlyViolation(self.user_url)
 
2715
            raise errors.AppendRevisionsOnlyViolation(self.base)
2765
2716
 
2766
2717
    def _gen_revision_history(self):
2767
2718
        """Generate the revision history from last revision
2867
2818
        if branch_location is None:
2868
2819
            return Branch.reference_parent(self, file_id, path,
2869
2820
                                           possible_transports)
2870
 
        branch_location = urlutils.join(self.user_url, branch_location)
 
2821
        branch_location = urlutils.join(self.base, branch_location)
2871
2822
        return Branch.open(branch_location,
2872
2823
                           possible_transports=possible_transports)
2873
2824
 
2988
2939
    """
2989
2940
 
2990
2941
    def get_stacked_on_url(self):
2991
 
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
2942
        raise errors.UnstackableBranchFormat(self._format, self.base)
2992
2943
 
2993
2944
 
2994
2945
######################################################################
3081
3032
        :param verbose: Requests more detailed display of what was checked,
3082
3033
            if any.
3083
3034
        """
3084
 
        note('checked branch %s format %s', self.branch.user_url,
 
3035
        note('checked branch %s format %s', self.branch.base,
3085
3036
            self.branch._format)
3086
3037
        for error in self.errors:
3087
3038
            note('found error:%s', error)
3416
3367
        if local and not bound_location:
3417
3368
            raise errors.LocalRequiresBoundBranch()
3418
3369
        master_branch = None
3419
 
        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:
3420
3371
            # not pulling from master, so we need to update master.
3421
3372
            master_branch = self.target.get_master_branch(possible_transports)
3422
3373
            master_branch.lock_write()