/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: Canonical.com Patch Queue Manager
  • Date: 2009-08-05 18:56:37 UTC
  • mfrom: (4580.5.16 1.18-win32-buildbot)
  • Revision ID: pqm@pqm.ubuntu.com-20090805185637-3f0y10upzcdw7e0g
Updates to buildout.cfg etc to have 'make installer-all' start being
        the preferred way to build win32 installer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
46
46
    )
47
47
""")
48
48
 
49
 
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
 
49
from bzrlib.decorators import needs_read_lock, needs_write_lock
50
50
from bzrlib.hooks import HookPoint, Hooks
51
51
from bzrlib.inter import InterObject
52
 
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
53
52
from bzrlib import registry
54
53
from bzrlib.symbol_versioning import (
55
54
    deprecated_in,
63
62
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
64
63
 
65
64
 
66
 
class Branch(bzrdir.ControlComponent):
 
65
# TODO: Maybe include checks for common corruption of newlines, etc?
 
66
 
 
67
# TODO: Some operations like log might retrieve the same revisions
 
68
# repeatedly to calculate deltas.  We could perhaps have a weakref
 
69
# cache in memory to make this faster.  In general anything can be
 
70
# cached in memory between lock and unlock operations. .. nb thats
 
71
# what the transaction identity map provides
 
72
 
 
73
 
 
74
######################################################################
 
75
# branch objects
 
76
 
 
77
class Branch(object):
67
78
    """Branch holding a history of revisions.
68
79
 
69
 
    :ivar base:
70
 
        Base directory/url of the branch; using control_url and
71
 
        control_transport is more standardized.
 
80
    base
 
81
        Base directory/url of the branch.
72
82
 
73
83
    hooks: An instance of BranchHooks.
74
84
    """
76
86
    # - RBC 20060112
77
87
    base = None
78
88
 
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
89
    def __init__(self, *ignored, **ignored_too):
88
90
        self.tags = self._format.make_tags(self)
89
91
        self._revision_history_cache = None
104
106
        """Activate the branch/repository from url as a fallback repository."""
105
107
        repo = self._get_fallback_repository(url)
106
108
        if repo.has_same_location(self.repository):
107
 
            raise errors.UnstackableLocationError(self.user_url, url)
 
109
            raise errors.UnstackableLocationError(self.base, url)
108
110
        self.repository.add_fallback_repository(repo)
109
111
 
110
112
    def break_lock(self):
147
149
        if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
148
150
            self._partial_revision_history_cache.pop()
149
151
 
150
 
    def _get_check_refs(self):
151
 
        """Get the references needed for check().
152
 
 
153
 
        See bzrlib.check.
154
 
        """
155
 
        revid = self.last_revision()
156
 
        return [('revision-existence', revid), ('lefthand-distance', revid)]
157
 
 
158
152
    @staticmethod
159
153
    def open(base, _unsupported=False, possible_transports=None):
160
154
        """Open the branch rooted at base.
164
158
        """
165
159
        control = bzrdir.BzrDir.open(base, _unsupported,
166
160
                                     possible_transports=possible_transports)
167
 
        return control.open_branch(unsupported=_unsupported)
 
161
        return control.open_branch(_unsupported)
168
162
 
169
163
    @staticmethod
170
 
    def open_from_transport(transport, name=None, _unsupported=False):
 
164
    def open_from_transport(transport, _unsupported=False):
171
165
        """Open the branch rooted at transport"""
172
166
        control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
173
 
        return control.open_branch(name=name, unsupported=_unsupported)
 
167
        return control.open_branch(_unsupported)
174
168
 
175
169
    @staticmethod
176
170
    def open_containing(url, possible_transports=None):
214
208
    def _get_fallback_repository(self, url):
215
209
        """Get the repository we fallback to at url."""
216
210
        url = urlutils.join(self.base, url)
217
 
        a_branch = Branch.open(url,
 
211
        a_bzrdir = bzrdir.BzrDir.open(url,
218
212
            possible_transports=[self.bzrdir.root_transport])
219
 
        return a_branch.repository
 
213
        return a_bzrdir.open_branch().repository
220
214
 
221
215
    def _get_tags_bytes(self):
222
216
        """Get the bytes of a serialised tags dict.
283
277
        new_history.reverse()
284
278
        return new_history
285
279
 
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
 
        """
 
280
    def lock_write(self):
293
281
        raise NotImplementedError(self.lock_write)
294
282
 
295
283
    def lock_read(self):
296
 
        """Lock the branch for read operations.
297
 
 
298
 
        :return: A bzrlib.lock.LogicalLockResult.
299
 
        """
300
284
        raise NotImplementedError(self.lock_read)
301
285
 
302
286
    def unlock(self):
427
411
            * 'include' - the stop revision is the last item in the result
428
412
            * 'with-merges' - include the stop revision and all of its
429
413
              merged revisions in the result
430
 
            * 'with-merges-without-common-ancestry' - filter out revisions 
431
 
              that are in both ancestries
432
414
        :param direction: either 'reverse' or 'forward':
433
415
            * reverse means return the start_revision_id first, i.e.
434
416
              start at the most recent revision and go backwards in history
456
438
        # start_revision_id.
457
439
        if self._merge_sorted_revisions_cache is None:
458
440
            last_revision = self.last_revision()
459
 
            known_graph = self.repository.get_known_graph_ancestry(
460
 
                [last_revision])
461
 
            self._merge_sorted_revisions_cache = known_graph.merge_sort(
462
 
                last_revision)
 
441
            graph = self.repository.get_graph()
 
442
            parent_map = dict(((key, value) for key, value in
 
443
                     graph.iter_ancestry([last_revision]) if value is not None))
 
444
            revision_graph = repository._strip_NULL_ghosts(parent_map)
 
445
            revs = tsort.merge_sort(revision_graph, last_revision, None,
 
446
                generate_revno=True)
 
447
            # Drop the sequence # before caching
 
448
            self._merge_sorted_revisions_cache = [r[1:] for r in revs]
 
449
 
463
450
        filtered = self._filter_merge_sorted_revisions(
464
451
            self._merge_sorted_revisions_cache, start_revision_id,
465
452
            stop_revision_id, stop_rule)
466
 
        # Make sure we don't return revisions that are not part of the
467
 
        # start_revision_id ancestry.
468
 
        filtered = self._filter_start_non_ancestors(filtered)
469
453
        if direction == 'reverse':
470
454
            return filtered
471
455
        if direction == 'forward':
478
462
        """Iterate over an inclusive range of sorted revisions."""
479
463
        rev_iter = iter(merge_sorted_revisions)
480
464
        if start_revision_id is not None:
481
 
            for node in rev_iter:
482
 
                rev_id = node.key[-1]
 
465
            for rev_id, depth, revno, end_of_merge in rev_iter:
483
466
                if rev_id != start_revision_id:
484
467
                    continue
485
468
                else:
486
469
                    # The decision to include the start or not
487
470
                    # depends on the stop_rule if a stop is provided
488
 
                    # so pop this node back into the iterator
489
 
                    rev_iter = chain(iter([node]), rev_iter)
 
471
                    rev_iter = chain(
 
472
                        iter([(rev_id, depth, revno, end_of_merge)]),
 
473
                        rev_iter)
490
474
                    break
491
475
        if stop_revision_id is None:
492
 
            # Yield everything
493
 
            for node in rev_iter:
494
 
                rev_id = node.key[-1]
495
 
                yield (rev_id, node.merge_depth, node.revno,
496
 
                       node.end_of_merge)
 
476
            for rev_id, depth, revno, end_of_merge in rev_iter:
 
477
                yield rev_id, depth, revno, end_of_merge
497
478
        elif stop_rule == 'exclude':
498
 
            for node in rev_iter:
499
 
                rev_id = node.key[-1]
 
479
            for rev_id, depth, revno, end_of_merge in rev_iter:
500
480
                if rev_id == stop_revision_id:
501
481
                    return
502
 
                yield (rev_id, node.merge_depth, node.revno,
503
 
                       node.end_of_merge)
 
482
                yield rev_id, depth, revno, end_of_merge
504
483
        elif stop_rule == 'include':
505
 
            for node in rev_iter:
506
 
                rev_id = node.key[-1]
507
 
                yield (rev_id, node.merge_depth, node.revno,
508
 
                       node.end_of_merge)
 
484
            for rev_id, depth, revno, end_of_merge in rev_iter:
 
485
                yield rev_id, depth, revno, end_of_merge
509
486
                if rev_id == stop_revision_id:
510
487
                    return
511
 
        elif stop_rule == 'with-merges-without-common-ancestry':
512
 
            # We want to exclude all revisions that are already part of the
513
 
            # stop_revision_id ancestry.
514
 
            graph = self.repository.get_graph()
515
 
            ancestors = graph.find_unique_ancestors(start_revision_id,
516
 
                                                    [stop_revision_id])
517
 
            for node in rev_iter:
518
 
                rev_id = node.key[-1]
519
 
                if rev_id not in ancestors:
520
 
                    continue
521
 
                yield (rev_id, node.merge_depth, node.revno,
522
 
                       node.end_of_merge)
523
488
        elif stop_rule == 'with-merges':
524
489
            stop_rev = self.repository.get_revision(stop_revision_id)
525
490
            if stop_rev.parent_ids:
526
491
                left_parent = stop_rev.parent_ids[0]
527
492
            else:
528
493
                left_parent = _mod_revision.NULL_REVISION
529
 
            # left_parent is the actual revision we want to stop logging at,
530
 
            # since we want to show the merged revisions after the stop_rev too
531
 
            reached_stop_revision_id = False
532
 
            revision_id_whitelist = []
533
 
            for node in rev_iter:
534
 
                rev_id = node.key[-1]
 
494
            for rev_id, depth, revno, end_of_merge in rev_iter:
535
495
                if rev_id == left_parent:
536
 
                    # reached the left parent after the stop_revision
537
496
                    return
538
 
                if (not reached_stop_revision_id or
539
 
                        rev_id in revision_id_whitelist):
540
 
                    yield (rev_id, node.merge_depth, node.revno,
541
 
                       node.end_of_merge)
542
 
                    if reached_stop_revision_id or rev_id == stop_revision_id:
543
 
                        # only do the merged revs of rev_id from now on
544
 
                        rev = self.repository.get_revision(rev_id)
545
 
                        if rev.parent_ids:
546
 
                            reached_stop_revision_id = True
547
 
                            revision_id_whitelist.extend(rev.parent_ids)
 
497
                yield rev_id, depth, revno, end_of_merge
548
498
        else:
549
499
            raise ValueError('invalid stop_rule %r' % stop_rule)
550
500
 
551
 
    def _filter_start_non_ancestors(self, rev_iter):
552
 
        # If we started from a dotted revno, we want to consider it as a tip
553
 
        # and don't want to yield revisions that are not part of its
554
 
        # ancestry. Given the order guaranteed by the merge sort, we will see
555
 
        # uninteresting descendants of the first parent of our tip before the
556
 
        # tip itself.
557
 
        first = rev_iter.next()
558
 
        (rev_id, merge_depth, revno, end_of_merge) = first
559
 
        yield first
560
 
        if not merge_depth:
561
 
            # We start at a mainline revision so by definition, all others
562
 
            # revisions in rev_iter are ancestors
563
 
            for node in rev_iter:
564
 
                yield node
565
 
 
566
 
        clean = False
567
 
        whitelist = set()
568
 
        pmap = self.repository.get_parent_map([rev_id])
569
 
        parents = pmap.get(rev_id, [])
570
 
        if parents:
571
 
            whitelist.update(parents)
572
 
        else:
573
 
            # If there is no parents, there is nothing of interest left
574
 
 
575
 
            # FIXME: It's hard to test this scenario here as this code is never
576
 
            # called in that case. -- vila 20100322
577
 
            return
578
 
 
579
 
        for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
580
 
            if not clean:
581
 
                if rev_id in whitelist:
582
 
                    pmap = self.repository.get_parent_map([rev_id])
583
 
                    parents = pmap.get(rev_id, [])
584
 
                    whitelist.remove(rev_id)
585
 
                    whitelist.update(parents)
586
 
                    if merge_depth == 0:
587
 
                        # We've reached the mainline, there is nothing left to
588
 
                        # filter
589
 
                        clean = True
590
 
                else:
591
 
                    # A revision that is not part of the ancestry of our
592
 
                    # starting revision.
593
 
                    continue
594
 
            yield (rev_id, merge_depth, revno, end_of_merge)
595
 
 
596
501
    def leave_lock_in_place(self):
597
502
        """Tell this branch object not to release the physical lock when this
598
503
        object is unlocked.
615
520
        :param other: The branch to bind to
616
521
        :type other: Branch
617
522
        """
618
 
        raise errors.UpgradeRequired(self.user_url)
 
523
        raise errors.UpgradeRequired(self.base)
619
524
 
620
525
    def set_append_revisions_only(self, enabled):
621
526
        if not self._format.supports_set_append_revisions_only():
622
 
            raise errors.UpgradeRequired(self.user_url)
 
527
            raise errors.UpgradeRequired(self.base)
623
528
        if enabled:
624
529
            value = 'True'
625
530
        else:
673
578
    def get_old_bound_location(self):
674
579
        """Return the URL of the branch we used to be bound to
675
580
        """
676
 
        raise errors.UpgradeRequired(self.user_url)
 
581
        raise errors.UpgradeRequired(self.base)
677
582
 
678
583
    def get_commit_builder(self, parents, config=None, timestamp=None,
679
584
                           timezone=None, committer=None, revprops=None,
757
662
            stacking.
758
663
        """
759
664
        if not self._format.supports_stacking():
760
 
            raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
665
            raise errors.UnstackableBranchFormat(self._format, self.base)
761
666
        # XXX: Changing from one fallback repository to another does not check
762
667
        # that all the data you need is present in the new fallback.
763
668
        # Possibly it should.
914
819
 
915
820
    def unbind(self):
916
821
        """Older format branches cannot bind or unbind."""
917
 
        raise errors.UpgradeRequired(self.user_url)
 
822
        raise errors.UpgradeRequired(self.base)
918
823
 
919
824
    def last_revision(self):
920
825
        """Return last revision id, or NULL_REVISION."""
1080
985
        try:
1081
986
            return urlutils.join(self.base[:-1], parent)
1082
987
        except errors.InvalidURLJoin, e:
1083
 
            raise errors.InaccessibleParent(parent, self.user_url)
 
988
            raise errors.InaccessibleParent(parent, self.base)
1084
989
 
1085
990
    def _get_parent_location(self):
1086
991
        raise NotImplementedError(self._get_parent_location)
1171
1076
        params = ChangeBranchTipParams(
1172
1077
            self, old_revno, new_revno, old_revid, new_revid)
1173
1078
        for hook in hooks:
1174
 
            hook(params)
 
1079
            try:
 
1080
                hook(params)
 
1081
            except errors.TipChangeRejected:
 
1082
                raise
 
1083
            except Exception:
 
1084
                exc_info = sys.exc_info()
 
1085
                hook_name = Branch.hooks.get_hook_name(hook)
 
1086
                raise errors.HookFailed(
 
1087
                    'pre_change_branch_tip', hook_name, exc_info)
1175
1088
 
1176
1089
    @needs_write_lock
1177
1090
    def update(self):
1226
1139
        revision_id: if not None, the revision history in the new branch will
1227
1140
                     be truncated to end with revision_id.
1228
1141
        """
1229
 
        if (repository_policy is not None and
1230
 
            repository_policy.requires_stacking()):
1231
 
            to_bzrdir._format.require_stacking(_skip_repo=True)
1232
1142
        result = to_bzrdir.create_branch()
1233
1143
        result.lock_write()
1234
1144
        try:
1302
1212
        target._set_all_reference_info(target_reference_dict)
1303
1213
 
1304
1214
    @needs_read_lock
1305
 
    def check(self, refs):
 
1215
    def check(self):
1306
1216
        """Check consistency of the branch.
1307
1217
 
1308
1218
        In particular this checks that revisions given in the revision-history
1311
1221
 
1312
1222
        Callers will typically also want to check the repository.
1313
1223
 
1314
 
        :param refs: Calculated refs for this branch as specified by
1315
 
            branch._get_check_refs()
1316
1224
        :return: A BranchCheckResult.
1317
1225
        """
1318
 
        result = BranchCheckResult(self)
 
1226
        ret = BranchCheckResult(self)
 
1227
        mainline_parent_id = None
1319
1228
        last_revno, last_revision_id = self.last_revision_info()
1320
 
        actual_revno = refs[('lefthand-distance', last_revision_id)]
1321
 
        if actual_revno != last_revno:
1322
 
            result.errors.append(errors.BzrCheckError(
1323
 
                'revno does not match len(mainline) %s != %s' % (
1324
 
                last_revno, actual_revno)))
1325
 
        # TODO: We should probably also check that self.revision_history
1326
 
        # matches the repository for older branch formats.
1327
 
        # If looking for the code that cross-checks repository parents against
1328
 
        # the iter_reverse_revision_history output, that is now a repository
1329
 
        # specific check.
1330
 
        return result
 
1229
        real_rev_history = []
 
1230
        try:
 
1231
            for revid in self.repository.iter_reverse_revision_history(
 
1232
                last_revision_id):
 
1233
                real_rev_history.append(revid)
 
1234
        except errors.RevisionNotPresent:
 
1235
            ret.ghosts_in_mainline = True
 
1236
        else:
 
1237
            ret.ghosts_in_mainline = False
 
1238
        real_rev_history.reverse()
 
1239
        if len(real_rev_history) != last_revno:
 
1240
            raise errors.BzrCheckError('revno does not match len(mainline)'
 
1241
                ' %s != %s' % (last_revno, len(real_rev_history)))
 
1242
        # TODO: We should probably also check that real_rev_history actually
 
1243
        #       matches self.revision_history()
 
1244
        for revision_id in real_rev_history:
 
1245
            try:
 
1246
                revision = self.repository.get_revision(revision_id)
 
1247
            except errors.NoSuchRevision, e:
 
1248
                raise errors.BzrCheckError("mainline revision {%s} not in repository"
 
1249
                            % revision_id)
 
1250
            # In general the first entry on the revision history has no parents.
 
1251
            # But it's not illegal for it to have parents listed; this can happen
 
1252
            # in imports from Arch when the parents weren't reachable.
 
1253
            if mainline_parent_id is not None:
 
1254
                if mainline_parent_id not in revision.parent_ids:
 
1255
                    raise errors.BzrCheckError("previous revision {%s} not listed among "
 
1256
                                        "parents of {%s}"
 
1257
                                        % (mainline_parent_id, revision_id))
 
1258
            mainline_parent_id = revision_id
 
1259
        return ret
1331
1260
 
1332
1261
    def _get_checkout_format(self):
1333
1262
        """Return the most suitable metadir for a checkout of this branch.
1358
1287
        # clone call. Or something. 20090224 RBC/spiv.
1359
1288
        if revision_id is None:
1360
1289
            revision_id = self.last_revision()
1361
 
        dir_to = self.bzrdir.clone_on_transport(to_transport,
1362
 
            revision_id=revision_id, stacked_on=stacked_on,
1363
 
            create_prefix=create_prefix, use_existing_dir=use_existing_dir)
 
1290
        try:
 
1291
            dir_to = self.bzrdir.clone_on_transport(to_transport,
 
1292
                revision_id=revision_id, stacked_on=stacked_on,
 
1293
                create_prefix=create_prefix, use_existing_dir=use_existing_dir)
 
1294
        except errors.FileExists:
 
1295
            if not use_existing_dir:
 
1296
                raise
 
1297
        except errors.NoSuchFile:
 
1298
            if not create_prefix:
 
1299
                raise
1364
1300
        return dir_to.open_branch()
1365
1301
 
1366
1302
    def create_checkout(self, to_location, revision_id=None,
1385
1321
        if lightweight:
1386
1322
            format = self._get_checkout_format()
1387
1323
            checkout = format.initialize_on_transport(t)
1388
 
            from_branch = BranchReferenceFormat().initialize(checkout, 
1389
 
                target_branch=self)
 
1324
            from_branch = BranchReferenceFormat().initialize(checkout, self)
1390
1325
        else:
1391
1326
            format = self._get_checkout_format()
1392
1327
            checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1434
1369
    def supports_tags(self):
1435
1370
        return self._format.supports_tags()
1436
1371
 
1437
 
    def automatic_tag_name(self, revision_id):
1438
 
        """Try to automatically find the tag name for a revision.
1439
 
 
1440
 
        :param revision_id: Revision id of the revision.
1441
 
        :return: A tag name or None if no tag name could be determined.
1442
 
        """
1443
 
        for hook in Branch.hooks['automatic_tag_name']:
1444
 
            ret = hook(self, revision_id)
1445
 
            if ret is not None:
1446
 
                return ret
1447
 
        return None
1448
 
 
1449
1372
    def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1450
1373
                                         other_branch):
1451
1374
        """Ensure that revision_b is a descendant of revision_a.
1515
1438
        return not (self == other)
1516
1439
 
1517
1440
    @classmethod
1518
 
    def find_format(klass, a_bzrdir, name=None):
 
1441
    def find_format(klass, a_bzrdir):
1519
1442
        """Return the format for the branch object in a_bzrdir."""
1520
1443
        try:
1521
 
            transport = a_bzrdir.get_branch_transport(None, name=name)
1522
 
            format_string = transport.get_bytes("format")
 
1444
            transport = a_bzrdir.get_branch_transport(None)
 
1445
            format_string = transport.get("format").read()
1523
1446
            return klass._formats[format_string]
1524
1447
        except errors.NoSuchFile:
1525
 
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
 
1448
            raise errors.NotBranchError(path=transport.base)
1526
1449
        except KeyError:
1527
1450
            raise errors.UnknownFormatError(format=format_string, kind='branch')
1528
1451
 
1564
1487
        """Return the short format description for this format."""
1565
1488
        raise NotImplementedError(self.get_format_description)
1566
1489
 
1567
 
    def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1568
 
        hooks = Branch.hooks['post_branch_init']
1569
 
        if not hooks:
1570
 
            return
1571
 
        params = BranchInitHookParams(self, a_bzrdir, name, branch)
1572
 
        for hook in hooks:
1573
 
            hook(params)
1574
 
 
1575
 
    def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1576
 
                           lock_type='metadir', set_format=True):
 
1490
    def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
 
1491
                           set_format=True):
1577
1492
        """Initialize a branch in a bzrdir, with specified files
1578
1493
 
1579
1494
        :param a_bzrdir: The bzrdir to initialize the branch in
1580
1495
        :param utf8_files: The files to create as a list of
1581
1496
            (filename, content) tuples
1582
 
        :param name: Name of colocated branch to create, if any
1583
1497
        :param set_format: If True, set the format with
1584
1498
            self.get_format_string.  (BzrBranch4 has its format set
1585
1499
            elsewhere)
1586
1500
        :return: a branch in this format
1587
1501
        """
1588
 
        mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1589
 
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
 
1502
        mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
 
1503
        branch_transport = a_bzrdir.get_branch_transport(self)
1590
1504
        lock_map = {
1591
1505
            'metadir': ('lock', lockdir.LockDir),
1592
1506
            'branch4': ('branch-lock', lockable_files.TransportLock),
1613
1527
        finally:
1614
1528
            if lock_taken:
1615
1529
                control_files.unlock()
1616
 
        branch = self.open(a_bzrdir, name, _found=True)
1617
 
        self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1618
 
        return branch
 
1530
        return self.open(a_bzrdir, _found=True)
1619
1531
 
1620
 
    def initialize(self, a_bzrdir, name=None):
1621
 
        """Create a branch of this format in a_bzrdir.
1622
 
        
1623
 
        :param name: Name of the colocated branch to create.
1624
 
        """
 
1532
    def initialize(self, a_bzrdir):
 
1533
        """Create a branch of this format in a_bzrdir."""
1625
1534
        raise NotImplementedError(self.initialize)
1626
1535
 
1627
1536
    def is_supported(self):
1657
1566
        """
1658
1567
        raise NotImplementedError(self.network_name)
1659
1568
 
1660
 
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
 
1569
    def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1661
1570
        """Return the branch object for a_bzrdir
1662
1571
 
1663
1572
        :param a_bzrdir: A BzrDir that contains a branch.
1664
 
        :param name: Name of colocated branch to open
1665
1573
        :param _found: a private parameter, do not use it. It is used to
1666
1574
            indicate if format probing has already be done.
1667
1575
        :param ignore_fallbacks: when set, no fallback branches will be opened
1775
1683
            "multiple hooks installed for transform_fallback_location, "
1776
1684
            "all are called with the url returned from the previous hook."
1777
1685
            "The order is however undefined.", (1, 9), None))
1778
 
        self.create_hook(HookPoint('automatic_tag_name',
1779
 
            "Called to determine an automatic tag name for a revision."
1780
 
            "automatic_tag_name is called with (branch, revision_id) and "
1781
 
            "should return a tag name or None if no tag name could be "
1782
 
            "determined. The first non-None tag name returned will be used.",
1783
 
            (2, 2), None))
1784
 
        self.create_hook(HookPoint('post_branch_init',
1785
 
            "Called after new branch initialization completes. "
1786
 
            "post_branch_init is called with a "
1787
 
            "bzrlib.branch.BranchInitHookParams. "
1788
 
            "Note that init, branch and checkout (both heavyweight and "
1789
 
            "lightweight) will all trigger this hook.", (2, 2), None))
1790
 
        self.create_hook(HookPoint('post_switch',
1791
 
            "Called after a checkout switches branch. "
1792
 
            "post_switch is called with a "
1793
 
            "bzrlib.branch.SwitchHookParams.", (2, 2), None))
1794
 
 
1795
1686
 
1796
1687
 
1797
1688
# install the default hooks into the Branch class.
1836
1727
            self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1837
1728
 
1838
1729
 
1839
 
class BranchInitHookParams(object):
1840
 
    """Object holding parameters passed to *_branch_init hooks.
1841
 
 
1842
 
    There are 4 fields that hooks may wish to access:
1843
 
 
1844
 
    :ivar format: the branch format
1845
 
    :ivar bzrdir: the BzrDir where the branch will be/has been initialized
1846
 
    :ivar name: name of colocated branch, if any (or None)
1847
 
    :ivar branch: the branch created
1848
 
 
1849
 
    Note that for lightweight checkouts, the bzrdir and format fields refer to
1850
 
    the checkout, hence they are different from the corresponding fields in
1851
 
    branch, which refer to the original branch.
1852
 
    """
1853
 
 
1854
 
    def __init__(self, format, a_bzrdir, name, branch):
1855
 
        """Create a group of BranchInitHook parameters.
1856
 
 
1857
 
        :param format: the branch format
1858
 
        :param a_bzrdir: the BzrDir where the branch will be/has been
1859
 
            initialized
1860
 
        :param name: name of colocated branch, if any (or None)
1861
 
        :param branch: the branch created
1862
 
 
1863
 
        Note that for lightweight checkouts, the bzrdir and format fields refer
1864
 
        to the checkout, hence they are different from the corresponding fields
1865
 
        in branch, which refer to the original branch.
1866
 
        """
1867
 
        self.format = format
1868
 
        self.bzrdir = a_bzrdir
1869
 
        self.name = name
1870
 
        self.branch = branch
1871
 
 
1872
 
    def __eq__(self, other):
1873
 
        return self.__dict__ == other.__dict__
1874
 
 
1875
 
    def __repr__(self):
1876
 
        if self.branch:
1877
 
            return "<%s of %s>" % (self.__class__.__name__, self.branch)
1878
 
        else:
1879
 
            return "<%s of format:%s bzrdir:%s>" % (
1880
 
                self.__class__.__name__, self.branch,
1881
 
                self.format, self.bzrdir)
1882
 
 
1883
 
 
1884
 
class SwitchHookParams(object):
1885
 
    """Object holding parameters passed to *_switch hooks.
1886
 
 
1887
 
    There are 4 fields that hooks may wish to access:
1888
 
 
1889
 
    :ivar control_dir: BzrDir of the checkout to change
1890
 
    :ivar to_branch: branch that the checkout is to reference
1891
 
    :ivar force: skip the check for local commits in a heavy checkout
1892
 
    :ivar revision_id: revision ID to switch to (or None)
1893
 
    """
1894
 
 
1895
 
    def __init__(self, control_dir, to_branch, force, revision_id):
1896
 
        """Create a group of SwitchHook parameters.
1897
 
 
1898
 
        :param control_dir: BzrDir of the checkout to change
1899
 
        :param to_branch: branch that the checkout is to reference
1900
 
        :param force: skip the check for local commits in a heavy checkout
1901
 
        :param revision_id: revision ID to switch to (or None)
1902
 
        """
1903
 
        self.control_dir = control_dir
1904
 
        self.to_branch = to_branch
1905
 
        self.force = force
1906
 
        self.revision_id = revision_id
1907
 
 
1908
 
    def __eq__(self, other):
1909
 
        return self.__dict__ == other.__dict__
1910
 
 
1911
 
    def __repr__(self):
1912
 
        return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1913
 
            self.control_dir, self.to_branch,
1914
 
            self.revision_id)
1915
 
 
1916
 
 
1917
1730
class BzrBranchFormat4(BranchFormat):
1918
1731
    """Bzr branch format 4.
1919
1732
 
1926
1739
        """See BranchFormat.get_format_description()."""
1927
1740
        return "Branch format 4"
1928
1741
 
1929
 
    def initialize(self, a_bzrdir, name=None):
 
1742
    def initialize(self, a_bzrdir):
1930
1743
        """Create a branch of this format in a_bzrdir."""
1931
1744
        utf8_files = [('revision-history', ''),
1932
1745
                      ('branch-name', ''),
1933
1746
                      ]
1934
 
        return self._initialize_helper(a_bzrdir, utf8_files, name=name,
 
1747
        return self._initialize_helper(a_bzrdir, utf8_files,
1935
1748
                                       lock_type='branch4', set_format=False)
1936
1749
 
1937
1750
    def __init__(self):
1942
1755
        """The network name for this format is the control dirs disk label."""
1943
1756
        return self._matchingbzrdir.get_format_string()
1944
1757
 
1945
 
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
 
1758
    def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1946
1759
        """See BranchFormat.open()."""
1947
1760
        if not _found:
1948
1761
            # we are being called directly and must probe.
1950
1763
        return BzrBranch(_format=self,
1951
1764
                         _control_files=a_bzrdir._control_files,
1952
1765
                         a_bzrdir=a_bzrdir,
1953
 
                         name=name,
1954
1766
                         _repository=a_bzrdir.open_repository())
1955
1767
 
1956
1768
    def __str__(self):
1971
1783
        """
1972
1784
        return self.get_format_string()
1973
1785
 
1974
 
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
 
1786
    def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1975
1787
        """See BranchFormat.open()."""
1976
1788
        if not _found:
1977
 
            format = BranchFormat.find_format(a_bzrdir, name=name)
 
1789
            format = BranchFormat.find_format(a_bzrdir)
1978
1790
            if format.__class__ != self.__class__:
1979
1791
                raise AssertionError("wrong format %r found for %r" %
1980
1792
                    (format, self))
1981
 
        transport = a_bzrdir.get_branch_transport(None, name=name)
1982
1793
        try:
 
1794
            transport = a_bzrdir.get_branch_transport(None)
1983
1795
            control_files = lockable_files.LockableFiles(transport, 'lock',
1984
1796
                                                         lockdir.LockDir)
1985
1797
            return self._branch_class()(_format=self,
1986
1798
                              _control_files=control_files,
1987
 
                              name=name,
1988
1799
                              a_bzrdir=a_bzrdir,
1989
1800
                              _repository=a_bzrdir.find_repository(),
1990
1801
                              ignore_fallbacks=ignore_fallbacks)
1991
1802
        except errors.NoSuchFile:
1992
 
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
 
1803
            raise errors.NotBranchError(path=transport.base)
1993
1804
 
1994
1805
    def __init__(self):
1995
1806
        super(BranchFormatMetadir, self).__init__()
2024
1835
        """See BranchFormat.get_format_description()."""
2025
1836
        return "Branch format 5"
2026
1837
 
2027
 
    def initialize(self, a_bzrdir, name=None):
 
1838
    def initialize(self, a_bzrdir):
2028
1839
        """Create a branch of this format in a_bzrdir."""
2029
1840
        utf8_files = [('revision-history', ''),
2030
1841
                      ('branch-name', ''),
2031
1842
                      ]
2032
 
        return self._initialize_helper(a_bzrdir, utf8_files, name)
 
1843
        return self._initialize_helper(a_bzrdir, utf8_files)
2033
1844
 
2034
1845
    def supports_tags(self):
2035
1846
        return False
2057
1868
        """See BranchFormat.get_format_description()."""
2058
1869
        return "Branch format 6"
2059
1870
 
2060
 
    def initialize(self, a_bzrdir, name=None):
 
1871
    def initialize(self, a_bzrdir):
2061
1872
        """Create a branch of this format in a_bzrdir."""
2062
1873
        utf8_files = [('last-revision', '0 null:\n'),
2063
1874
                      ('branch.conf', ''),
2064
1875
                      ('tags', ''),
2065
1876
                      ]
2066
 
        return self._initialize_helper(a_bzrdir, utf8_files, name)
 
1877
        return self._initialize_helper(a_bzrdir, utf8_files)
2067
1878
 
2068
1879
    def make_tags(self, branch):
2069
1880
        """See bzrlib.branch.BranchFormat.make_tags()."""
2087
1898
        """See BranchFormat.get_format_description()."""
2088
1899
        return "Branch format 8"
2089
1900
 
2090
 
    def initialize(self, a_bzrdir, name=None):
 
1901
    def initialize(self, a_bzrdir):
2091
1902
        """Create a branch of this format in a_bzrdir."""
2092
1903
        utf8_files = [('last-revision', '0 null:\n'),
2093
1904
                      ('branch.conf', ''),
2094
1905
                      ('tags', ''),
2095
1906
                      ('references', '')
2096
1907
                      ]
2097
 
        return self._initialize_helper(a_bzrdir, utf8_files, name)
 
1908
        return self._initialize_helper(a_bzrdir, utf8_files)
2098
1909
 
2099
1910
    def __init__(self):
2100
1911
        super(BzrBranchFormat8, self).__init__()
2123
1934
    This format was introduced in bzr 1.6.
2124
1935
    """
2125
1936
 
2126
 
    def initialize(self, a_bzrdir, name=None):
 
1937
    def initialize(self, a_bzrdir):
2127
1938
        """Create a branch of this format in a_bzrdir."""
2128
1939
        utf8_files = [('last-revision', '0 null:\n'),
2129
1940
                      ('branch.conf', ''),
2130
1941
                      ('tags', ''),
2131
1942
                      ]
2132
 
        return self._initialize_helper(a_bzrdir, utf8_files, name)
 
1943
        return self._initialize_helper(a_bzrdir, utf8_files)
2133
1944
 
2134
1945
    def _branch_class(self):
2135
1946
        return BzrBranch7
2170
1981
    def get_reference(self, a_bzrdir):
2171
1982
        """See BranchFormat.get_reference()."""
2172
1983
        transport = a_bzrdir.get_branch_transport(None)
2173
 
        return transport.get_bytes('location')
 
1984
        return transport.get('location').read()
2174
1985
 
2175
1986
    def set_reference(self, a_bzrdir, to_branch):
2176
1987
        """See BranchFormat.set_reference()."""
2177
1988
        transport = a_bzrdir.get_branch_transport(None)
2178
1989
        location = transport.put_bytes('location', to_branch.base)
2179
1990
 
2180
 
    def initialize(self, a_bzrdir, name=None, target_branch=None):
 
1991
    def initialize(self, a_bzrdir, target_branch=None):
2181
1992
        """Create a branch of this format in a_bzrdir."""
2182
1993
        if target_branch is None:
2183
1994
            # this format does not implement branch itself, thus the implicit
2184
1995
            # creation contract must see it as uninitializable
2185
1996
            raise errors.UninitializableFormat(self)
2186
 
        mutter('creating branch reference in %s', a_bzrdir.user_url)
2187
 
        branch_transport = a_bzrdir.get_branch_transport(self, name=name)
 
1997
        mutter('creating branch reference in %s', a_bzrdir.transport.base)
 
1998
        branch_transport = a_bzrdir.get_branch_transport(self)
2188
1999
        branch_transport.put_bytes('location',
2189
 
            target_branch.bzrdir.user_url)
 
2000
            target_branch.bzrdir.root_transport.base)
2190
2001
        branch_transport.put_bytes('format', self.get_format_string())
2191
 
        branch = self.open(
2192
 
            a_bzrdir, name, _found=True,
 
2002
        return self.open(
 
2003
            a_bzrdir, _found=True,
2193
2004
            possible_transports=[target_branch.bzrdir.root_transport])
2194
 
        self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2195
 
        return branch
2196
2005
 
2197
2006
    def __init__(self):
2198
2007
        super(BranchReferenceFormat, self).__init__()
2204
2013
        def clone(to_bzrdir, revision_id=None,
2205
2014
            repository_policy=None):
2206
2015
            """See Branch.clone()."""
2207
 
            return format.initialize(to_bzrdir, target_branch=a_branch)
 
2016
            return format.initialize(to_bzrdir, a_branch)
2208
2017
            # cannot obey revision_id limits when cloning a reference ...
2209
2018
            # FIXME RBC 20060210 either nuke revision_id for clone, or
2210
2019
            # emit some sort of warning/error to the caller ?!
2211
2020
        return clone
2212
2021
 
2213
 
    def open(self, a_bzrdir, name=None, _found=False, location=None,
 
2022
    def open(self, a_bzrdir, _found=False, location=None,
2214
2023
             possible_transports=None, ignore_fallbacks=False):
2215
2024
        """Return the branch that the branch reference in a_bzrdir points at.
2216
2025
 
2217
2026
        :param a_bzrdir: A BzrDir that contains a branch.
2218
 
        :param name: Name of colocated branch to open, if any
2219
2027
        :param _found: a private parameter, do not use it. It is used to
2220
2028
            indicate if format probing has already be done.
2221
2029
        :param ignore_fallbacks: when set, no fallback branches will be opened
2226
2034
        :param possible_transports: An optional reusable transports list.
2227
2035
        """
2228
2036
        if not _found:
2229
 
            format = BranchFormat.find_format(a_bzrdir, name=name)
 
2037
            format = BranchFormat.find_format(a_bzrdir)
2230
2038
            if format.__class__ != self.__class__:
2231
2039
                raise AssertionError("wrong format %r found for %r" %
2232
2040
                    (format, self))
2234
2042
            location = self.get_reference(a_bzrdir)
2235
2043
        real_bzrdir = bzrdir.BzrDir.open(
2236
2044
            location, possible_transports=possible_transports)
2237
 
        result = real_bzrdir.open_branch(name=name, 
2238
 
            ignore_fallbacks=ignore_fallbacks)
 
2045
        result = real_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2239
2046
        # this changes the behaviour of result.clone to create a new reference
2240
2047
        # rather than a copy of the content of the branch.
2241
2048
        # I did not use a proxy object because that needs much more extensive
2268
2075
BranchFormat.register_format(__format6)
2269
2076
BranchFormat.register_format(__format7)
2270
2077
BranchFormat.register_format(__format8)
2271
 
BranchFormat.set_default_format(__format7)
 
2078
BranchFormat.set_default_format(__format6)
2272
2079
_legacy_formats = [BzrBranchFormat4(),
2273
2080
    ]
2274
2081
network_format_registry.register(
2275
2082
    _legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2276
2083
 
2277
2084
 
2278
 
class BranchWriteLockResult(LogicalLockResult):
2279
 
    """The result of write locking a branch.
2280
 
 
2281
 
    :ivar branch_token: The token obtained from the underlying branch lock, or
2282
 
        None.
2283
 
    :ivar unlock: A callable which will unlock the lock.
2284
 
    """
2285
 
 
2286
 
    def __init__(self, unlock, branch_token):
2287
 
        LogicalLockResult.__init__(self, unlock)
2288
 
        self.branch_token = branch_token
2289
 
 
2290
 
    def __repr__(self):
2291
 
        return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2292
 
            self.unlock)
2293
 
 
2294
 
 
2295
 
class BzrBranch(Branch, _RelockDebugMixin):
 
2085
class BzrBranch(Branch):
2296
2086
    """A branch stored in the actual filesystem.
2297
2087
 
2298
2088
    Note that it's "local" in the context of the filesystem; it doesn't
2304
2094
    :ivar repository: Repository for this branch.
2305
2095
    :ivar base: The url of the base directory for this branch; the one
2306
2096
        containing the .bzr directory.
2307
 
    :ivar name: Optional colocated branch name as it exists in the control
2308
 
        directory.
2309
2097
    """
2310
2098
 
2311
2099
    def __init__(self, _format=None,
2312
 
                 _control_files=None, a_bzrdir=None, name=None,
2313
 
                 _repository=None, ignore_fallbacks=False):
 
2100
                 _control_files=None, a_bzrdir=None, _repository=None,
 
2101
                 ignore_fallbacks=False):
2314
2102
        """Create new branch object at a particular location."""
2315
2103
        if a_bzrdir is None:
2316
2104
            raise ValueError('a_bzrdir must be supplied')
2317
2105
        else:
2318
2106
            self.bzrdir = a_bzrdir
2319
2107
        self._base = self.bzrdir.transport.clone('..').base
2320
 
        self.name = name
2321
2108
        # XXX: We should be able to just do
2322
2109
        #   self.base = self.bzrdir.root_transport.base
2323
2110
        # but this does not quite work yet -- mbp 20080522
2330
2117
        Branch.__init__(self)
2331
2118
 
2332
2119
    def __str__(self):
2333
 
        if self.name is None:
2334
 
            return '%s(%s)' % (self.__class__.__name__, self.user_url)
2335
 
        else:
2336
 
            return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
2337
 
                self.name)
 
2120
        return '%s(%r)' % (self.__class__.__name__, self.base)
2338
2121
 
2339
2122
    __repr__ = __str__
2340
2123
 
2351
2134
        return self.control_files.is_locked()
2352
2135
 
2353
2136
    def lock_write(self, token=None):
2354
 
        """Lock the branch for write operations.
2355
 
 
2356
 
        :param token: A token to permit reacquiring a previously held and
2357
 
            preserved lock.
2358
 
        :return: A BranchWriteLockResult.
2359
 
        """
2360
 
        if not self.is_locked():
2361
 
            self._note_lock('w')
2362
2137
        # All-in-one needs to always unlock/lock.
2363
2138
        repo_control = getattr(self.repository, 'control_files', None)
2364
2139
        if self.control_files == repo_control or not self.is_locked():
2365
 
            self.repository._warn_if_deprecated(self)
2366
2140
            self.repository.lock_write()
2367
2141
            took_lock = True
2368
2142
        else:
2369
2143
            took_lock = False
2370
2144
        try:
2371
 
            return BranchWriteLockResult(self.unlock,
2372
 
                self.control_files.lock_write(token=token))
 
2145
            return self.control_files.lock_write(token=token)
2373
2146
        except:
2374
2147
            if took_lock:
2375
2148
                self.repository.unlock()
2376
2149
            raise
2377
2150
 
2378
2151
    def lock_read(self):
2379
 
        """Lock the branch for read operations.
2380
 
 
2381
 
        :return: A bzrlib.lock.LogicalLockResult.
2382
 
        """
2383
 
        if not self.is_locked():
2384
 
            self._note_lock('r')
2385
2152
        # All-in-one needs to always unlock/lock.
2386
2153
        repo_control = getattr(self.repository, 'control_files', None)
2387
2154
        if self.control_files == repo_control or not self.is_locked():
2388
 
            self.repository._warn_if_deprecated(self)
2389
2155
            self.repository.lock_read()
2390
2156
            took_lock = True
2391
2157
        else:
2392
2158
            took_lock = False
2393
2159
        try:
2394
2160
            self.control_files.lock_read()
2395
 
            return LogicalLockResult(self.unlock)
2396
2161
        except:
2397
2162
            if took_lock:
2398
2163
                self.repository.unlock()
2399
2164
            raise
2400
2165
 
2401
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2402
2166
    def unlock(self):
2403
2167
        try:
2404
2168
            self.control_files.unlock()
2567
2331
        return result
2568
2332
 
2569
2333
    def get_stacked_on_url(self):
2570
 
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
2334
        raise errors.UnstackableBranchFormat(self._format, self.base)
2571
2335
 
2572
2336
    def set_push_location(self, location):
2573
2337
        """See Branch.set_push_location."""
2763
2527
        if _mod_revision.is_null(last_revision):
2764
2528
            return
2765
2529
        if last_revision not in self._lefthand_history(revision_id):
2766
 
            raise errors.AppendRevisionsOnlyViolation(self.user_url)
 
2530
            raise errors.AppendRevisionsOnlyViolation(self.base)
2767
2531
 
2768
2532
    def _gen_revision_history(self):
2769
2533
        """Generate the revision history from last revision
2869
2633
        if branch_location is None:
2870
2634
            return Branch.reference_parent(self, file_id, path,
2871
2635
                                           possible_transports)
2872
 
        branch_location = urlutils.join(self.user_url, branch_location)
 
2636
        branch_location = urlutils.join(self.base, branch_location)
2873
2637
        return Branch.open(branch_location,
2874
2638
                           possible_transports=possible_transports)
2875
2639
 
2921
2685
        return stacked_url
2922
2686
 
2923
2687
    def _get_append_revisions_only(self):
2924
 
        return self.get_config(
2925
 
            ).get_user_option_as_bool('append_revisions_only')
 
2688
        value = self.get_config().get_user_option('append_revisions_only')
 
2689
        return value == 'True'
2926
2690
 
2927
2691
    @needs_write_lock
2928
2692
    def generate_revision_history(self, revision_id, last_rev=None,
2990
2754
    """
2991
2755
 
2992
2756
    def get_stacked_on_url(self):
2993
 
        raise errors.UnstackableBranchFormat(self._format, self.user_url)
 
2757
        raise errors.UnstackableBranchFormat(self._format, self.base)
2994
2758
 
2995
2759
 
2996
2760
######################################################################
3075
2839
 
3076
2840
    def __init__(self, branch):
3077
2841
        self.branch = branch
3078
 
        self.errors = []
 
2842
        self.ghosts_in_mainline = False
3079
2843
 
3080
2844
    def report_results(self, verbose):
3081
2845
        """Report the check results via trace.note.
3083
2847
        :param verbose: Requests more detailed display of what was checked,
3084
2848
            if any.
3085
2849
        """
3086
 
        note('checked branch %s format %s', self.branch.user_url,
3087
 
            self.branch._format)
3088
 
        for error in self.errors:
3089
 
            note('found error:%s', error)
 
2850
        note('checked branch %s format %s',
 
2851
             self.branch.base,
 
2852
             self.branch._format)
 
2853
        if self.ghosts_in_mainline:
 
2854
            note('branch contains ghosts in mainline')
3090
2855
 
3091
2856
 
3092
2857
class Converter5to6(object):
3418
3183
        if local and not bound_location:
3419
3184
            raise errors.LocalRequiresBoundBranch()
3420
3185
        master_branch = None
3421
 
        if not local and bound_location and self.source.user_url != bound_location:
 
3186
        if not local and bound_location and self.source.base != bound_location:
3422
3187
            # not pulling from master, so we need to update master.
3423
3188
            master_branch = self.target.get_master_branch(possible_transports)
3424
3189
            master_branch.lock_write()