/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/bzrdir.py

  • Committer: Johan Walles
  • Date: 2009-05-06 05:36:28 UTC
  • mfrom: (4332 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090506053628-tbf1wz4a0m9t684g
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1
 
# Copyright (C) 2006-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
29
29
 
30
30
import os
31
31
import sys
32
 
import warnings
33
32
 
34
33
from bzrlib.lazy_import import lazy_import
35
34
lazy_import(globals(), """
71
70
    do_catching_redirections,
72
71
    get_transport,
73
72
    local,
 
73
    remote as remote_transport,
74
74
    )
75
75
from bzrlib.weave import Weave
76
76
""")
78
78
from bzrlib.trace import (
79
79
    mutter,
80
80
    note,
81
 
    warning,
82
81
    )
83
82
 
84
83
from bzrlib import (
86
85
    registry,
87
86
    symbol_versioning,
88
87
    )
89
 
    
90
 
    
91
 
class ControlComponent(object):
92
 
    """Abstract base class for control directory components.
93
 
    
94
 
    This provides interfaces that are common across bzrdirs, 
95
 
    repositories, branches, and workingtree control directories.
96
 
    
97
 
    They all expose two urls and transports: the *user* URL is the 
98
 
    one that stops above the control directory (eg .bzr) and that 
99
 
    should normally be used in messages, and the *control* URL is
100
 
    under that in eg .bzr/checkout and is used to read the control
101
 
    files.
102
 
    
103
 
    This can be used as a mixin and is intended to fit with 
104
 
    foreign formats.
105
 
    """
106
 
    
107
 
    @property
108
 
    def control_transport(self):
109
 
        raise NotImplementedError
110
 
   
111
 
    @property
112
 
    def control_url(self):
113
 
        return self.control_transport.base
114
 
    
115
 
    @property
116
 
    def user_transport(self):
117
 
        raise NotImplementedError
118
 
        
119
 
    @property
120
 
    def user_url(self):
121
 
        return self.user_transport.base
122
 
    
123
 
 
124
 
class BzrDir(ControlComponent):
 
88
 
 
89
 
 
90
class BzrDir(object):
125
91
    """A .bzr control diretory.
126
92
 
127
93
    BzrDir instances let you create or open any of the things that can be
163
129
        return True
164
130
 
165
131
    def check_conversion_target(self, target_format):
166
 
        """Check that a bzrdir as a whole can be converted to a new format."""
167
 
        # The only current restriction is that the repository content can be 
168
 
        # fetched compatibly with the target.
169
132
        target_repo_format = target_format.repository_format
170
 
        try:
171
 
            self.open_repository()._format.check_conversion_target(
172
 
                target_repo_format)
173
 
        except errors.NoRepositoryPresent:
174
 
            # No repo, no problem.
175
 
            pass
 
133
        source_repo_format = self._format.repository_format
 
134
        source_repo_format.check_conversion_target(target_repo_format)
176
135
 
177
136
    @staticmethod
178
137
    def _check_supported(format, allow_unsupported,
294
253
                # copied, and finally if we are copying up to a specific
295
254
                # revision_id then we can use the pending-ancestry-result which
296
255
                # does not require traversing all of history to describe it.
297
 
                if (result_repo.user_url == result.user_url
298
 
                    and not require_stacking and
 
256
                if (result_repo.bzrdir.root_transport.base ==
 
257
                    result.root_transport.base and not require_stacking and
299
258
                    revision_id is not None):
300
259
                    fetch_spec = graph.PendingAncestryResult(
301
260
                        [revision_id], local_repo)
388
347
                for subdir in sorted(subdirs, reverse=True):
389
348
                    pending.append(current_transport.clone(subdir))
390
349
 
391
 
    def list_branches(self):
392
 
        """Return a sequence of all branches local to this control directory.
393
 
 
394
 
        """
395
 
        try:
396
 
            return [self.open_branch()]
397
 
        except errors.NotBranchError:
398
 
            return []
399
 
 
400
350
    @staticmethod
401
351
    def find_branches(transport):
402
352
        """Find all branches under a transport.
414
364
            except errors.NoRepositoryPresent:
415
365
                pass
416
366
            else:
417
 
                return False, ([], repository)
418
 
            return True, (bzrdir.list_branches(), None)
419
 
        ret = []
420
 
        for branches, repo in BzrDir.find_bzrdirs(transport,
421
 
                                                  evaluate=evaluate):
 
367
                return False, (None, repository)
 
368
            try:
 
369
                branch = bzrdir.open_branch()
 
370
            except errors.NotBranchError:
 
371
                return True, (None, None)
 
372
            else:
 
373
                return True, (branch, None)
 
374
        branches = []
 
375
        for branch, repo in BzrDir.find_bzrdirs(transport, evaluate=evaluate):
422
376
            if repo is not None:
423
 
                ret.extend(repo.find_branches())
424
 
            if branches is not None:
425
 
                ret.extend(branches)
426
 
        return ret
 
377
                branches.extend(repo.find_branches())
 
378
            if branch is not None:
 
379
                branches.append(branch)
 
380
        return branches
427
381
 
428
382
    def destroy_repository(self):
429
383
        """Destroy the repository in this BzrDir"""
430
384
        raise NotImplementedError(self.destroy_repository)
431
385
 
432
 
    def create_branch(self, name=None):
 
386
    def create_branch(self):
433
387
        """Create a branch in this BzrDir.
434
388
 
435
 
        :param name: Name of the colocated branch to create, None for
436
 
            the default branch.
437
 
 
438
389
        The bzrdir's format will control what branch format is created.
439
390
        For more control see BranchFormatXX.create(a_bzrdir).
440
391
        """
441
392
        raise NotImplementedError(self.create_branch)
442
393
 
443
 
    def destroy_branch(self, name=None):
444
 
        """Destroy a branch in this BzrDir.
445
 
        
446
 
        :param name: Name of the branch to destroy, None for the default 
447
 
            branch.
448
 
        """
 
394
    def destroy_branch(self):
 
395
        """Destroy the branch in this BzrDir"""
449
396
        raise NotImplementedError(self.destroy_branch)
450
397
 
451
398
    @staticmethod
491
438
            stop = False
492
439
            stack_on = config.get_default_stack_on()
493
440
            if stack_on is not None:
494
 
                stack_on_pwd = found_bzrdir.user_url
 
441
                stack_on_pwd = found_bzrdir.root_transport.base
495
442
                stop = True
496
443
            # does it have a repository ?
497
444
            try:
499
446
            except errors.NoRepositoryPresent:
500
447
                repository = None
501
448
            else:
502
 
                if (found_bzrdir.user_url != self.user_url 
503
 
                    and not repository.is_shared()):
 
449
                if ((found_bzrdir.root_transport.base !=
 
450
                     self.root_transport.base) and not repository.is_shared()):
504
451
                    # Don't look higher, can't use a higher shared repo.
505
452
                    repository = None
506
453
                    stop = True
620
567
 
621
568
        :return: Tuple with old path name and new path name
622
569
        """
623
 
        def name_gen(base='backup.bzr'):
624
 
            counter = 1
625
 
            name = "%s.~%d~" % (base, counter)
626
 
            while self.root_transport.has(name):
627
 
                counter += 1
628
 
                name = "%s.~%d~" % (base, counter)
629
 
            return name
630
 
 
631
 
        backup_dir=name_gen()
632
570
        pb = ui.ui_factory.nested_progress_bar()
633
571
        try:
634
572
            # FIXME: bug 300001 -- the backup fails if the backup directory
635
573
            # already exists, but it should instead either remove it or make
636
574
            # a new backup directory.
637
575
            #
 
576
            # FIXME: bug 262450 -- the backup directory should have the same
 
577
            # permissions as the .bzr directory (probably a bug in copy_tree)
638
578
            old_path = self.root_transport.abspath('.bzr')
639
 
            new_path = self.root_transport.abspath(backup_dir)
640
 
            ui.ui_factory.note('making backup of %s\n  to %s' % (old_path, new_path,))
641
 
            self.root_transport.copy_tree('.bzr', backup_dir)
 
579
            new_path = self.root_transport.abspath('backup.bzr')
 
580
            pb.note('making backup of %s' % (old_path,))
 
581
            pb.note('  to %s' % (new_path,))
 
582
            self.root_transport.copy_tree('.bzr', 'backup.bzr')
642
583
            return (old_path, new_path)
643
584
        finally:
644
585
            pb.finished()
702
643
            if stop:
703
644
                return result
704
645
            next_transport = found_bzrdir.root_transport.clone('..')
705
 
            if (found_bzrdir.user_url == next_transport.base):
 
646
            if (found_bzrdir.root_transport.base == next_transport.base):
706
647
                # top of the file system
707
648
                return None
708
649
            # find the next containing bzrdir
725
666
                repository = found_bzrdir.open_repository()
726
667
            except errors.NoRepositoryPresent:
727
668
                return None, False
728
 
            if found_bzrdir.user_url == self.user_url:
 
669
            if found_bzrdir.root_transport.base == self.root_transport.base:
729
670
                return repository, True
730
671
            elif repository.is_shared():
731
672
                return repository, True
737
678
            raise errors.NoRepositoryPresent(self)
738
679
        return found_repo
739
680
 
740
 
    def get_branch_reference(self, name=None):
 
681
    def get_branch_reference(self):
741
682
        """Return the referenced URL for the branch in this bzrdir.
742
683
 
743
 
        :param name: Optional colocated branch name
744
684
        :raises NotBranchError: If there is no Branch.
745
 
        :raises NoColocatedBranchSupport: If a branch name was specified
746
 
            but colocated branches are not supported.
747
685
        :return: The URL the branch in this bzrdir references if it is a
748
686
            reference branch, or None for regular branches.
749
687
        """
750
 
        if name is not None:
751
 
            raise errors.NoColocatedBranchSupport(self)
752
688
        return None
753
689
 
754
 
    def get_branch_transport(self, branch_format, name=None):
 
690
    def get_branch_transport(self, branch_format):
755
691
        """Get the transport for use by branch format in this BzrDir.
756
692
 
757
693
        Note that bzr dirs that do not support format strings will raise
852
788
        :param _transport: the transport this dir is based at.
853
789
        """
854
790
        self._format = _format
855
 
        # these are also under the more standard names of 
856
 
        # control_transport and user_transport
857
791
        self.transport = _transport.clone('.bzr')
858
792
        self.root_transport = _transport
859
793
        self._mode_check_done = False
860
 
        
861
 
    @property 
862
 
    def user_transport(self):
863
 
        return self.root_transport
864
 
        
865
 
    @property
866
 
    def control_transport(self):
867
 
        return self.transport
868
794
 
869
795
    def is_control_filename(self, filename):
870
796
        """True if filename is the name of a path which is reserved for bzrdir's.
945
871
        BzrDir._check_supported(format, _unsupported)
946
872
        return format.open(transport, _found=True)
947
873
 
948
 
    def open_branch(self, name=None, unsupported=False,
949
 
                    ignore_fallbacks=False):
 
874
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
950
875
        """Open the branch object at this BzrDir if one is present.
951
876
 
952
877
        If unsupported is True, then no longer supported branch formats can
999
924
                raise errors.NotBranchError(path=url)
1000
925
            a_transport = new_t
1001
926
 
1002
 
    def _get_tree_branch(self, name=None):
 
927
    def _get_tree_branch(self):
1003
928
        """Return the branch and tree, if any, for this bzrdir.
1004
929
 
1005
 
        :param name: Name of colocated branch to open.
1006
 
 
1007
930
        Return None for tree if not present or inaccessible.
1008
931
        Raise NotBranchError if no branch is present.
1009
932
        :return: (tree, branch)
1012
935
            tree = self.open_workingtree()
1013
936
        except (errors.NoWorkingTree, errors.NotLocalUrl):
1014
937
            tree = None
1015
 
            branch = self.open_branch(name=name)
 
938
            branch = self.open_branch()
1016
939
        else:
1017
 
            if name is not None:
1018
 
                branch = self.open_branch(name=name)
1019
 
            else:
1020
 
                branch = tree.branch
 
940
            branch = tree.branch
1021
941
        return tree, branch
1022
942
 
1023
943
    @classmethod
1095
1015
        """
1096
1016
        raise NotImplementedError(self.open_workingtree)
1097
1017
 
1098
 
    def has_branch(self, name=None):
 
1018
    def has_branch(self):
1099
1019
        """Tell if this bzrdir contains a branch.
1100
1020
 
1101
1021
        Note: if you're going to open the branch, you should just go ahead
1103
1023
        branch and discards it, and that's somewhat expensive.)
1104
1024
        """
1105
1025
        try:
1106
 
            self.open_branch(name)
 
1026
            self.open_branch()
1107
1027
            return True
1108
1028
        except errors.NotBranchError:
1109
1029
            return False
1314
1234
        return result
1315
1235
 
1316
1236
    def push_branch(self, source, revision_id=None, overwrite=False, 
1317
 
        remember=False, create_prefix=False):
 
1237
        remember=False):
1318
1238
        """Push the source branch into this BzrDir."""
1319
1239
        br_to = None
1320
1240
        # If we can open a branch, use its direct repository, otherwise see
1383
1303
        self.create_hook(hooks.HookPoint('pre_open',
1384
1304
            "Invoked before attempting to open a BzrDir with the transport "
1385
1305
            "that the open will use.", (1, 14), None))
1386
 
        self.create_hook(hooks.HookPoint('post_repo_init',
1387
 
            "Invoked after a repository has been initialized. "
1388
 
            "post_repo_init is called with a "
1389
 
            "bzrlib.bzrdir.RepoInitHookParams.",
1390
 
            (2, 2), None))
1391
1306
 
1392
1307
# install the default hooks
1393
1308
BzrDir.hooks = BzrDirHooks()
1394
1309
 
1395
1310
 
1396
 
class RepoInitHookParams(object):
1397
 
    """Object holding parameters passed to *_repo_init hooks.
1398
 
 
1399
 
    There are 4 fields that hooks may wish to access:
1400
 
 
1401
 
    :ivar repository: Repository created
1402
 
    :ivar format: Repository format
1403
 
    :ivar bzrdir: The bzrdir for the repository
1404
 
    :ivar shared: The repository is shared
1405
 
    """
1406
 
 
1407
 
    def __init__(self, repository, format, a_bzrdir, shared):
1408
 
        """Create a group of RepoInitHook parameters.
1409
 
 
1410
 
        :param repository: Repository created
1411
 
        :param format: Repository format
1412
 
        :param bzrdir: The bzrdir for the repository
1413
 
        :param shared: The repository is shared
1414
 
        """
1415
 
        self.repository = repository
1416
 
        self.format = format
1417
 
        self.bzrdir = a_bzrdir
1418
 
        self.shared = shared
1419
 
 
1420
 
    def __eq__(self, other):
1421
 
        return self.__dict__ == other.__dict__
1422
 
 
1423
 
    def __repr__(self):
1424
 
        if self.repository:
1425
 
            return "<%s for %s>" % (self.__class__.__name__,
1426
 
                self.repository)
1427
 
        else:
1428
 
            return "<%s for %s>" % (self.__class__.__name__,
1429
 
                self.bzrdir)
1430
 
 
1431
 
 
1432
1311
class BzrDirPreSplitOut(BzrDir):
1433
1312
    """A common class for the all-in-one formats."""
1434
1313
 
1473
1352
            tree.clone(result)
1474
1353
        return result
1475
1354
 
1476
 
    def create_branch(self, name=None):
 
1355
    def create_branch(self):
1477
1356
        """See BzrDir.create_branch."""
1478
 
        return self._format.get_branch_format().initialize(self, name=name)
 
1357
        return self._format.get_branch_format().initialize(self)
1479
1358
 
1480
 
    def destroy_branch(self, name=None):
 
1359
    def destroy_branch(self):
1481
1360
        """See BzrDir.destroy_branch."""
1482
1361
        raise errors.UnsupportedOperation(self.destroy_branch, self)
1483
1362
 
1506
1385
        # that can do wonky stuff here, and that only
1507
1386
        # happens for creating checkouts, which cannot be
1508
1387
        # done on this format anyway. So - acceptable wart.
1509
 
        if hardlink:
1510
 
            warning("can't support hardlinked working trees in %r"
1511
 
                % (self,))
1512
1388
        try:
1513
1389
            result = self.open_workingtree(recommend_upgrade=False)
1514
1390
        except errors.NoSuchFile:
1539
1415
        raise errors.UnsupportedOperation(self.destroy_workingtree_metadata,
1540
1416
                                          self)
1541
1417
 
1542
 
    def get_branch_transport(self, branch_format, name=None):
 
1418
    def get_branch_transport(self, branch_format):
1543
1419
        """See BzrDir.get_branch_transport()."""
1544
 
        if name is not None:
1545
 
            raise errors.NoColocatedBranchSupport(self)
1546
1420
        if branch_format is None:
1547
1421
            return self.transport
1548
1422
        try:
1581
1455
            format = BzrDirFormat.get_default_format()
1582
1456
        return not isinstance(self._format, format.__class__)
1583
1457
 
1584
 
    def open_branch(self, name=None, unsupported=False,
1585
 
                    ignore_fallbacks=False):
 
1458
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
1586
1459
        """See BzrDir.open_branch."""
1587
1460
        from bzrlib.branch import BzrBranchFormat4
1588
1461
        format = BzrBranchFormat4()
1589
1462
        self._check_supported(format, unsupported)
1590
 
        return format.open(self, name, _found=True)
 
1463
        return format.open(self, _found=True)
1591
1464
 
1592
1465
    def sprout(self, url, revision_id=None, force_new_repo=False,
1593
1466
               possible_transports=None, accelerator_tree=None,
1654
1527
    This is a deprecated format and may be removed after sept 2006.
1655
1528
    """
1656
1529
 
1657
 
    def has_workingtree(self):
1658
 
        """See BzrDir.has_workingtree."""
1659
 
        return True
1660
 
    
1661
1530
    def open_repository(self):
1662
1531
        """See BzrDir.open_repository."""
1663
1532
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1679
1548
    This is a deprecated format and may be removed after sept 2006.
1680
1549
    """
1681
1550
 
1682
 
    def has_workingtree(self):
1683
 
        """See BzrDir.has_workingtree."""
1684
 
        return True
1685
 
    
1686
1551
    def open_repository(self):
1687
1552
        """See BzrDir.open_repository."""
1688
1553
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1710
1575
        """See BzrDir.can_convert_format()."""
1711
1576
        return True
1712
1577
 
1713
 
    def create_branch(self, name=None):
 
1578
    def create_branch(self):
1714
1579
        """See BzrDir.create_branch."""
1715
 
        return self._format.get_branch_format().initialize(self, name=name)
 
1580
        return self._format.get_branch_format().initialize(self)
1716
1581
 
1717
 
    def destroy_branch(self, name=None):
 
1582
    def destroy_branch(self):
1718
1583
        """See BzrDir.create_branch."""
1719
 
        if name is not None:
1720
 
            raise errors.NoColocatedBranchSupport(self)
1721
1584
        self.transport.delete_tree('branch')
1722
1585
 
1723
1586
    def create_repository(self, shared=False):
1746
1609
    def destroy_workingtree_metadata(self):
1747
1610
        self.transport.delete_tree('checkout')
1748
1611
 
1749
 
    def find_branch_format(self, name=None):
 
1612
    def find_branch_format(self):
1750
1613
        """Find the branch 'format' for this bzrdir.
1751
1614
 
1752
1615
        This might be a synthetic object for e.g. RemoteBranch and SVN.
1753
1616
        """
1754
1617
        from bzrlib.branch import BranchFormat
1755
 
        return BranchFormat.find_format(self, name=name)
 
1618
        return BranchFormat.find_format(self)
1756
1619
 
1757
1620
    def _get_mkdir_mode(self):
1758
1621
        """Figure out the mode to use when creating a bzrdir subdir."""
1760
1623
                                     lockable_files.TransportLock)
1761
1624
        return temp_control._dir_mode
1762
1625
 
1763
 
    def get_branch_reference(self, name=None):
 
1626
    def get_branch_reference(self):
1764
1627
        """See BzrDir.get_branch_reference()."""
1765
1628
        from bzrlib.branch import BranchFormat
1766
 
        format = BranchFormat.find_format(self, name=name)
1767
 
        return format.get_reference(self, name=name)
 
1629
        format = BranchFormat.find_format(self)
 
1630
        return format.get_reference(self)
1768
1631
 
1769
 
    def get_branch_transport(self, branch_format, name=None):
 
1632
    def get_branch_transport(self, branch_format):
1770
1633
        """See BzrDir.get_branch_transport()."""
1771
 
        if name is not None:
1772
 
            raise errors.NoColocatedBranchSupport(self)
1773
 
        # XXX: this shouldn't implicitly create the directory if it's just
1774
 
        # promising to get a transport -- mbp 20090727
1775
1634
        if branch_format is None:
1776
1635
            return self.transport.clone('branch')
1777
1636
        try:
1812
1671
            pass
1813
1672
        return self.transport.clone('checkout')
1814
1673
 
1815
 
    def has_workingtree(self):
1816
 
        """Tell if this bzrdir contains a working tree.
1817
 
 
1818
 
        This will still raise an exception if the bzrdir has a workingtree that
1819
 
        is remote & inaccessible.
1820
 
 
1821
 
        Note: if you're going to open the working tree, you should just go
1822
 
        ahead and try, and not ask permission first.
1823
 
        """
1824
 
        from bzrlib.workingtree import WorkingTreeFormat
1825
 
        try:
1826
 
            WorkingTreeFormat.find_format(self)
1827
 
        except errors.NoWorkingTree:
1828
 
            return False
1829
 
        return True
1830
 
 
1831
1674
    def needs_format_conversion(self, format=None):
1832
1675
        """See BzrDir.needs_format_conversion()."""
1833
1676
        if format is None:
1846
1689
                return True
1847
1690
        except errors.NoRepositoryPresent:
1848
1691
            pass
1849
 
        for branch in self.list_branches():
1850
 
            if not isinstance(branch._format,
 
1692
        try:
 
1693
            if not isinstance(self.open_branch()._format,
1851
1694
                              format.get_branch_format().__class__):
1852
1695
                # the branch needs an upgrade.
1853
1696
                return True
 
1697
        except errors.NotBranchError:
 
1698
            pass
1854
1699
        try:
1855
1700
            my_wt = self.open_workingtree(recommend_upgrade=False)
1856
1701
            if not isinstance(my_wt._format,
1861
1706
            pass
1862
1707
        return False
1863
1708
 
1864
 
    def open_branch(self, name=None, unsupported=False,
1865
 
                    ignore_fallbacks=False):
 
1709
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
1866
1710
        """See BzrDir.open_branch."""
1867
 
        format = self.find_branch_format(name=name)
 
1711
        format = self.find_branch_format()
1868
1712
        self._check_supported(format, unsupported)
1869
 
        return format.open(self, name=name,
1870
 
            _found=True, ignore_fallbacks=ignore_fallbacks)
 
1713
        return format.open(self, _found=True, ignore_fallbacks=ignore_fallbacks)
1871
1714
 
1872
1715
    def open_repository(self, unsupported=False):
1873
1716
        """See BzrDir.open_repository."""
1905
1748
    Once a format is deprecated, just deprecate the initialize and open
1906
1749
    methods on the format class. Do not deprecate the object, as the
1907
1750
    object will be created every system load.
1908
 
 
1909
 
    :cvar colocated_branches: Whether this formats supports colocated branches.
1910
1751
    """
1911
1752
 
1912
1753
    _default_format = None
1929
1770
 
1930
1771
    _lock_file_name = 'branch-lock'
1931
1772
 
1932
 
    colocated_branches = False
1933
 
    """Whether co-located branches are supported for this control dir format.
1934
 
    """
1935
 
 
1936
1773
    # _lock_class must be set in subclasses to the lock type, typ.
1937
1774
    # TransportLock or LockDir
1938
1775
 
1955
1792
    def probe_transport(klass, transport):
1956
1793
        """Return the .bzrdir style format present in a directory."""
1957
1794
        try:
1958
 
            format_string = transport.get_bytes(".bzr/branch-format")
 
1795
            format_string = transport.get(".bzr/branch-format").read()
1959
1796
        except errors.NoSuchFile:
1960
1797
            raise errors.NotBranchError(path=transport.base)
1961
1798
 
2521
2358
    def set_branch_format(self, format):
2522
2359
        self._branch_format = format
2523
2360
 
2524
 
    def require_stacking(self, stack_on=None, possible_transports=None,
2525
 
            _skip_repo=False):
2526
 
        """We have a request to stack, try to ensure the formats support it.
2527
 
 
2528
 
        :param stack_on: If supplied, it is the URL to a branch that we want to
2529
 
            stack on. Check to see if that format supports stacking before
2530
 
            forcing an upgrade.
2531
 
        """
2532
 
        # Stacking is desired. requested by the target, but does the place it
2533
 
        # points at support stacking? If it doesn't then we should
2534
 
        # not implicitly upgrade. We check this here.
2535
 
        new_repo_format = None
2536
 
        new_branch_format = None
2537
 
 
2538
 
        # a bit of state for get_target_branch so that we don't try to open it
2539
 
        # 2 times, for both repo *and* branch
2540
 
        target = [None, False, None] # target_branch, checked, upgrade anyway
2541
 
        def get_target_branch():
2542
 
            if target[1]:
2543
 
                # We've checked, don't check again
2544
 
                return target
2545
 
            if stack_on is None:
2546
 
                # No target format, that means we want to force upgrading
2547
 
                target[:] = [None, True, True]
2548
 
                return target
2549
 
            try:
2550
 
                target_dir = BzrDir.open(stack_on,
2551
 
                    possible_transports=possible_transports)
2552
 
            except errors.NotBranchError:
2553
 
                # Nothing there, don't change formats
2554
 
                target[:] = [None, True, False]
2555
 
                return target
2556
 
            except errors.JailBreak:
2557
 
                # JailBreak, JFDI and upgrade anyway
2558
 
                target[:] = [None, True, True]
2559
 
                return target
2560
 
            try:
2561
 
                target_branch = target_dir.open_branch()
2562
 
            except errors.NotBranchError:
2563
 
                # No branch, don't upgrade formats
2564
 
                target[:] = [None, True, False]
2565
 
                return target
2566
 
            target[:] = [target_branch, True, False]
2567
 
            return target
2568
 
 
2569
 
        if (not _skip_repo and
2570
 
                 not self.repository_format.supports_external_lookups):
2571
 
            # We need to upgrade the Repository.
2572
 
            target_branch, _, do_upgrade = get_target_branch()
2573
 
            if target_branch is None:
2574
 
                # We don't have a target branch, should we upgrade anyway?
2575
 
                if do_upgrade:
2576
 
                    # stack_on is inaccessible, JFDI.
2577
 
                    # TODO: bad monkey, hard-coded formats...
2578
 
                    if self.repository_format.rich_root_data:
2579
 
                        new_repo_format = pack_repo.RepositoryFormatKnitPack5RichRoot()
2580
 
                    else:
2581
 
                        new_repo_format = pack_repo.RepositoryFormatKnitPack5()
2582
 
            else:
2583
 
                # If the target already supports stacking, then we know the
2584
 
                # project is already able to use stacking, so auto-upgrade
2585
 
                # for them
2586
 
                new_repo_format = target_branch.repository._format
2587
 
                if not new_repo_format.supports_external_lookups:
2588
 
                    # target doesn't, source doesn't, so don't auto upgrade
2589
 
                    # repo
2590
 
                    new_repo_format = None
2591
 
            if new_repo_format is not None:
2592
 
                self.repository_format = new_repo_format
2593
 
                note('Source repository format does not support stacking,'
2594
 
                     ' using format:\n  %s',
2595
 
                     new_repo_format.get_format_description())
2596
 
 
 
2361
    def require_stacking(self):
2597
2362
        if not self.get_branch_format().supports_stacking():
2598
 
            # We just checked the repo, now lets check if we need to
2599
 
            # upgrade the branch format
2600
 
            target_branch, _, do_upgrade = get_target_branch()
2601
 
            if target_branch is None:
2602
 
                if do_upgrade:
2603
 
                    # TODO: bad monkey, hard-coded formats...
2604
 
                    new_branch_format = branch.BzrBranchFormat7()
 
2363
            # We need to make a stacked branch, but the default format for the
 
2364
            # target doesn't support stacking.  So force a branch that *can*
 
2365
            # support stacking.
 
2366
            from bzrlib.branch import BzrBranchFormat7
 
2367
            branch_format = BzrBranchFormat7()
 
2368
            self.set_branch_format(branch_format)
 
2369
            mutter("using %r for stacking" % (branch_format,))
 
2370
            from bzrlib.repofmt import pack_repo
 
2371
            if self.repository_format.rich_root_data:
 
2372
                bzrdir_format_name = '1.6.1-rich-root'
 
2373
                repo_format = pack_repo.RepositoryFormatKnitPack5RichRoot()
2605
2374
            else:
2606
 
                new_branch_format = target_branch._format
2607
 
                if not new_branch_format.supports_stacking():
2608
 
                    new_branch_format = None
2609
 
            if new_branch_format is not None:
2610
 
                # Does support stacking, use its format.
2611
 
                self.set_branch_format(new_branch_format)
2612
 
                note('Source branch format does not support stacking,'
2613
 
                     ' using format:\n  %s',
2614
 
                     new_branch_format.get_format_description())
 
2375
                bzrdir_format_name = '1.6'
 
2376
                repo_format = pack_repo.RepositoryFormatKnitPack5()
 
2377
            note('Source format does not support stacking, using format:'
 
2378
                 ' \'%s\'\n  %s\n',
 
2379
                 bzrdir_format_name, repo_format.get_format_description())
 
2380
            self.repository_format = repo_format
2615
2381
 
2616
2382
    def get_converter(self, format=None):
2617
2383
        """See BzrDirFormat.get_converter()."""
2737
2503
    def convert(self, to_convert, pb):
2738
2504
        """See Converter.convert()."""
2739
2505
        self.bzrdir = to_convert
2740
 
        if pb is not None:
2741
 
            warnings.warn("pb parameter to convert() is deprecated")
2742
 
        self.pb = ui.ui_factory.nested_progress_bar()
2743
 
        try:
2744
 
            ui.ui_factory.note('starting upgrade from format 4 to 5')
2745
 
            if isinstance(self.bzrdir.transport, local.LocalTransport):
2746
 
                self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
2747
 
            self._convert_to_weaves()
2748
 
            return BzrDir.open(self.bzrdir.user_url)
2749
 
        finally:
2750
 
            self.pb.finished()
 
2506
        self.pb = pb
 
2507
        self.pb.note('starting upgrade from format 4 to 5')
 
2508
        if isinstance(self.bzrdir.transport, local.LocalTransport):
 
2509
            self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
 
2510
        self._convert_to_weaves()
 
2511
        return BzrDir.open(self.bzrdir.root_transport.base)
2751
2512
 
2752
2513
    def _convert_to_weaves(self):
2753
 
        ui.ui_factory.note('note: upgrade may be faster if all store files are ungzipped first')
 
2514
        self.pb.note('note: upgrade may be faster if all store files are ungzipped first')
2754
2515
        try:
2755
2516
            # TODO permissions
2756
2517
            stat = self.bzrdir.transport.stat('weaves')
2784
2545
        self.pb.clear()
2785
2546
        self._write_all_weaves()
2786
2547
        self._write_all_revs()
2787
 
        ui.ui_factory.note('upgraded to weaves:')
2788
 
        ui.ui_factory.note('  %6d revisions and inventories' % len(self.revisions))
2789
 
        ui.ui_factory.note('  %6d revisions not present' % len(self.absent_revisions))
2790
 
        ui.ui_factory.note('  %6d texts' % self.text_count)
 
2548
        self.pb.note('upgraded to weaves:')
 
2549
        self.pb.note('  %6d revisions and inventories', len(self.revisions))
 
2550
        self.pb.note('  %6d revisions not present', len(self.absent_revisions))
 
2551
        self.pb.note('  %6d texts', self.text_count)
2791
2552
        self._cleanup_spare_files_after_format4()
2792
2553
        self.branch._transport.put_bytes(
2793
2554
            'branch-format',
2861
2622
                       len(self.known_revisions))
2862
2623
        if not self.branch.repository.has_revision(rev_id):
2863
2624
            self.pb.clear()
2864
 
            ui.ui_factory.note('revision {%s} not present in branch; '
2865
 
                         'will be converted as a ghost' %
 
2625
            self.pb.note('revision {%s} not present in branch; '
 
2626
                         'will be converted as a ghost',
2866
2627
                         rev_id)
2867
2628
            self.absent_revisions.add(rev_id)
2868
2629
        else:
2873
2634
            self.revisions[rev_id] = rev
2874
2635
 
2875
2636
    def _load_old_inventory(self, rev_id):
2876
 
        f = self.branch.repository.inventory_store.get(rev_id)
2877
 
        try:
2878
 
            old_inv_xml = f.read()
2879
 
        finally:
2880
 
            f.close()
 
2637
        old_inv_xml = self.branch.repository.inventory_store.get(rev_id).read()
2881
2638
        inv = xml4.serializer_v4.read_inventory_from_string(old_inv_xml)
2882
2639
        inv.revision_id = rev_id
2883
2640
        rev = self.revisions[rev_id]
2942
2699
        del ie.text_id
2943
2700
 
2944
2701
    def get_parent_map(self, revision_ids):
2945
 
        """See graph.StackedParentsProvider.get_parent_map"""
 
2702
        """See graph._StackedParentsProvider.get_parent_map"""
2946
2703
        return dict((revision_id, self.revisions[revision_id])
2947
2704
                    for revision_id in revision_ids
2948
2705
                     if revision_id in self.revisions)
2961
2718
                ie.revision = previous_ie.revision
2962
2719
                return
2963
2720
        if ie.has_text():
2964
 
            f = self.branch.repository._text_store.get(ie.text_id)
2965
 
            try:
2966
 
                file_lines = f.readlines()
2967
 
            finally:
2968
 
                f.close()
 
2721
            text = self.branch.repository._text_store.get(ie.text_id)
 
2722
            file_lines = text.readlines()
2969
2723
            w.add_lines(rev_id, previous_revisions, file_lines)
2970
2724
            self.text_count += 1
2971
2725
        else:
3001
2755
    def convert(self, to_convert, pb):
3002
2756
        """See Converter.convert()."""
3003
2757
        self.bzrdir = to_convert
3004
 
        pb = ui.ui_factory.nested_progress_bar()
3005
 
        try:
3006
 
            ui.ui_factory.note('starting upgrade from format 5 to 6')
3007
 
            self._convert_to_prefixed()
3008
 
            return BzrDir.open(self.bzrdir.user_url)
3009
 
        finally:
3010
 
            pb.finished()
 
2758
        self.pb = pb
 
2759
        self.pb.note('starting upgrade from format 5 to 6')
 
2760
        self._convert_to_prefixed()
 
2761
        return BzrDir.open(self.bzrdir.root_transport.base)
3011
2762
 
3012
2763
    def _convert_to_prefixed(self):
3013
2764
        from bzrlib.store import TransportStore
3014
2765
        self.bzrdir.transport.delete('branch-format')
3015
2766
        for store_name in ["weaves", "revision-store"]:
3016
 
            ui.ui_factory.note("adding prefixes to %s" % store_name)
 
2767
            self.pb.note("adding prefixes to %s" % store_name)
3017
2768
            store_transport = self.bzrdir.transport.clone(store_name)
3018
2769
            store = TransportStore(store_transport, prefixed=True)
3019
2770
            for urlfilename in store_transport.list_dir('.'):
3046
2797
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
3047
2798
        from bzrlib.branch import BzrBranchFormat5
3048
2799
        self.bzrdir = to_convert
3049
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
2800
        self.pb = pb
3050
2801
        self.count = 0
3051
2802
        self.total = 20 # the steps we know about
3052
2803
        self.garbage_inventories = []
3053
2804
        self.dir_mode = self.bzrdir._get_dir_mode()
3054
2805
        self.file_mode = self.bzrdir._get_file_mode()
3055
2806
 
3056
 
        ui.ui_factory.note('starting upgrade from format 6 to metadir')
 
2807
        self.pb.note('starting upgrade from format 6 to metadir')
3057
2808
        self.bzrdir.transport.put_bytes(
3058
2809
                'branch-format',
3059
2810
                "Converting to format 6",
3109
2860
        else:
3110
2861
            has_checkout = True
3111
2862
        if not has_checkout:
3112
 
            ui.ui_factory.note('No working tree.')
 
2863
            self.pb.note('No working tree.')
3113
2864
            # If some checkout files are there, we may as well get rid of them.
3114
2865
            for name, mandatory in checkout_files:
3115
2866
                if name in bzrcontents:
3132
2883
            'branch-format',
3133
2884
            BzrDirMetaFormat1().get_format_string(),
3134
2885
            mode=self.file_mode)
3135
 
        self.pb.finished()
3136
 
        return BzrDir.open(self.bzrdir.user_url)
 
2886
        return BzrDir.open(self.bzrdir.root_transport.base)
3137
2887
 
3138
2888
    def make_lock(self, name):
3139
2889
        """Make a lock for the new control dir name."""
3174
2924
    def convert(self, to_convert, pb):
3175
2925
        """See Converter.convert()."""
3176
2926
        self.bzrdir = to_convert
3177
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
2927
        self.pb = pb
3178
2928
        self.count = 0
3179
2929
        self.total = 1
3180
2930
        self.step('checking repository format')
3185
2935
        else:
3186
2936
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
3187
2937
                from bzrlib.repository import CopyConverter
3188
 
                ui.ui_factory.note('starting repository conversion')
 
2938
                self.pb.note('starting repository conversion')
3189
2939
                converter = CopyConverter(self.target_format.repository_format)
3190
2940
                converter.convert(repo, pb)
3191
 
        for branch in self.bzrdir.list_branches():
 
2941
        try:
 
2942
            branch = self.bzrdir.open_branch()
 
2943
        except errors.NotBranchError:
 
2944
            pass
 
2945
        else:
3192
2946
            # TODO: conversions of Branch and Tree should be done by
3193
2947
            # InterXFormat lookups/some sort of registry.
3194
2948
            # Avoid circular imports
3209
2963
                      new is _mod_branch.BzrBranchFormat8):
3210
2964
                    branch_converter = _mod_branch.Converter7to8()
3211
2965
                else:
3212
 
                    raise errors.BadConversionTarget("No converter", new,
3213
 
                        branch._format)
 
2966
                    raise errors.BadConversionTarget("No converter", new)
3214
2967
                branch_converter.convert(branch)
3215
2968
                branch = self.bzrdir.open_branch()
3216
2969
                old = branch._format.__class__
3236
2989
                isinstance(self.target_format.workingtree_format,
3237
2990
                    workingtree_4.WorkingTreeFormat6)):
3238
2991
                workingtree_4.Converter4or5to6().convert(tree)
3239
 
        self.pb.finished()
3240
2992
        return to_convert
3241
2993
 
3242
2994
 
3249
3001
 
3250
3002
    def __init__(self):
3251
3003
        BzrDirMetaFormat1.__init__(self)
3252
 
        # XXX: It's a bit ugly that the network name is here, because we'd
3253
 
        # like to believe that format objects are stateless or at least
3254
 
        # immutable,  However, we do at least avoid mutating the name after
3255
 
        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
3256
3004
        self._network_name = None
3257
3005
 
3258
 
    def __repr__(self):
3259
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
3260
 
            self._network_name)
3261
 
 
3262
3006
    def get_format_description(self):
3263
 
        if self._network_name:
3264
 
            real_format = network_format_registry.get(self._network_name)
3265
 
            return 'Remote: ' + real_format.get_format_description()
3266
3007
        return 'bzr remote bzrdir'
3267
3008
 
3268
3009
    def get_format_string(self):
3308
3049
            return local_dir_format.initialize_on_transport(transport)
3309
3050
        client = _SmartClient(client_medium)
3310
3051
        path = client.remote_path_from_transport(transport)
3311
 
        try:
3312
 
            response = client.call('BzrDirFormat.initialize', path)
3313
 
        except errors.ErrorFromSmartServer, err:
3314
 
            remote._translate_error(err, path=path)
 
3052
        response = client.call('BzrDirFormat.initialize', path)
3315
3053
        if response[0] != 'ok':
3316
3054
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
3317
3055
        format = RemoteBzrDirFormat()
3365
3103
        if not do_vfs:
3366
3104
            client = _SmartClient(client_medium)
3367
3105
            path = client.remote_path_from_transport(transport)
3368
 
            if client_medium._is_remote_before((1, 16)):
 
3106
            if client_medium._is_remote_before((1, 15)):
3369
3107
                do_vfs = True
3370
3108
        if do_vfs:
3371
3109
            # TODO: lookup the local format from a server hint.
3377
3115
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3378
3116
                make_working_trees=make_working_trees, shared_repo=shared_repo,
3379
3117
                vfs_only=True)
3380
 
        return self._initialize_on_transport_ex_rpc(client, path, transport,
3381
 
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
3382
 
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
3383
 
 
3384
 
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
3385
 
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
3386
 
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
3387
3118
        args = []
3388
3119
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
3389
3120
        args.append(self._serialize_NoneTrueFalse(create_prefix))
3401
3132
        args.append(self._serialize_NoneString(repo_format_name))
3402
3133
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
3403
3134
        args.append(self._serialize_NoneTrueFalse(shared_repo))
3404
 
        request_network_name = self._network_name or \
 
3135
        if self._network_name is None:
 
3136
            self._network_name = \
3405
3137
            BzrDirFormat.get_default_format().network_name()
3406
3138
        try:
3407
 
            response = client.call('BzrDirFormat.initialize_ex_1.16',
3408
 
                request_network_name, path, *args)
 
3139
            response = client.call('BzrDirFormat.initialize_ex',
 
3140
                self.network_name(), path, *args)
3409
3141
        except errors.UnknownSmartMethod:
3410
 
            client._medium._remember_remote_is_before((1,16))
3411
3142
            local_dir_format = BzrDirMetaFormat1()
3412
3143
            self._supply_sub_formats_to(local_dir_format)
3413
3144
            return local_dir_format.initialize_on_transport_ex(transport,
3416
3147
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3417
3148
                make_working_trees=make_working_trees, shared_repo=shared_repo,
3418
3149
                vfs_only=True)
3419
 
        except errors.ErrorFromSmartServer, err:
3420
 
            remote._translate_error(err, path=path)
3421
3150
        repo_path = response[0]
3422
3151
        bzrdir_name = response[6]
3423
3152
        require_stacking = response[7]
3439
3168
                repo_bzr = bzrdir
3440
3169
            final_stack = response[8] or None
3441
3170
            final_stack_pwd = response[9] or None
3442
 
            if final_stack_pwd:
3443
 
                final_stack_pwd = urlutils.join(
3444
 
                    transport.base, final_stack_pwd)
3445
3171
            remote_repo = remote.RemoteRepository(repo_bzr, repo_format)
3446
3172
            if len(response) > 10:
3447
3173
                # Updated server verb that locks remotely.
3457
3183
        else:
3458
3184
            remote_repo = None
3459
3185
            policy = None
3460
 
        bzrdir._format.set_branch_format(self.get_branch_format())
3461
 
        if require_stacking:
3462
 
            # The repo has already been created, but we need to make sure that
3463
 
            # we'll make a stackable branch.
3464
 
            bzrdir._format.require_stacking(_skip_repo=True)
3465
3186
        return remote_repo, bzrdir, require_stacking, policy
3466
3187
 
3467
3188
    def _open(self, transport):
3643
3364
            if info.native:
3644
3365
                help = '(native) ' + help
3645
3366
            return ':%s:\n%s\n\n' % (key,
3646
 
                textwrap.fill(help, initial_indent='    ',
3647
 
                    subsequent_indent='    ',
3648
 
                    break_long_words=False))
 
3367
                    textwrap.fill(help, initial_indent='    ',
 
3368
                    subsequent_indent='    '))
3649
3369
        if default_realkey is not None:
3650
3370
            output += wrapped(default_realkey, '(default) %s' % default_help,
3651
3371
                              self.get_info('default'))
3661
3381
                experimental_pairs.append((key, help))
3662
3382
            else:
3663
3383
                output += wrapped(key, help, info)
3664
 
        output += "\nSee :doc:`formats-help` for more about storage formats."
 
3384
        output += "\nSee ``bzr help formats`` for more about storage formats."
3665
3385
        other_output = ""
3666
3386
        if len(experimental_pairs) > 0:
3667
3387
            other_output += "Experimental formats are shown below.\n\n"
3680
3400
            other_output += \
3681
3401
                "\nNo deprecated formats are available.\n\n"
3682
3402
        other_output += \
3683
 
                "\nSee :doc:`formats-help` for more about storage formats."
 
3403
            "\nSee ``bzr help formats`` for more about storage formats."
3684
3404
 
3685
3405
        if topic == 'other-formats':
3686
3406
            return other_output
3720
3440
            try:
3721
3441
                stack_on = urlutils.rebase_url(self._stack_on,
3722
3442
                    self._stack_on_pwd,
3723
 
                    branch.user_url)
 
3443
                    branch.bzrdir.root_transport.base)
3724
3444
            except errors.InvalidRebaseURLs:
3725
3445
                stack_on = self._get_full_stack_on()
3726
3446
        try:
3730
3450
            if self._require_stacking:
3731
3451
                raise
3732
3452
 
3733
 
    def requires_stacking(self):
3734
 
        """Return True if this policy requires stacking."""
3735
 
        return self._stack_on is not None and self._require_stacking
3736
 
 
3737
3453
    def _get_full_stack_on(self):
3738
3454
        """Get a fully-qualified URL for the stack_on location."""
3739
3455
        if self._stack_on is None:
3804
3520
        """
3805
3521
        stack_on = self._get_full_stack_on()
3806
3522
        if stack_on:
 
3523
            # Stacking is desired. requested by the target, but does the place it
 
3524
            # points at support stacking? If it doesn't then we should
 
3525
            # not implicitly upgrade. We check this here.
3807
3526
            format = self._bzrdir._format
3808
 
            format.require_stacking(stack_on=stack_on,
3809
 
                                    possible_transports=[self._bzrdir.root_transport])
 
3527
            if not (format.repository_format.supports_external_lookups
 
3528
                and format.get_branch_format().supports_stacking()):
 
3529
                # May need to upgrade - but only do if the target also
 
3530
                # supports stacking. Note that this currently wastes
 
3531
                # network round trips to check - but we only do this
 
3532
                # when the source can't stack so it will fade away
 
3533
                # as people do upgrade.
 
3534
                branch_format = None
 
3535
                repo_format = None
 
3536
                try:
 
3537
                    target_dir = BzrDir.open(stack_on,
 
3538
                        possible_transports=[self._bzrdir.root_transport])
 
3539
                except errors.NotBranchError:
 
3540
                    # Nothing there, don't change formats
 
3541
                    pass
 
3542
                except errors.JailBreak:
 
3543
                    # stack_on is inaccessible, JFDI.
 
3544
                    if format.repository_format.rich_root_data:
 
3545
                        repo_format = pack_repo.RepositoryFormatKnitPack6RichRoot()
 
3546
                    else:
 
3547
                        repo_format = pack_repo.RepositoryFormatKnitPack6()
 
3548
                    branch_format = branch.BzrBranchFormat7()
 
3549
                else:
 
3550
                    try:
 
3551
                        target_branch = target_dir.open_branch()
 
3552
                    except errors.NotBranchError:
 
3553
                        # No branch, don't change formats
 
3554
                        pass
 
3555
                    else:
 
3556
                        branch_format = target_branch._format
 
3557
                        repo_format = target_branch.repository._format
 
3558
                        if not (branch_format.supports_stacking()
 
3559
                            and repo_format.supports_external_lookups):
 
3560
                            # Doesn't stack itself, don't force an upgrade
 
3561
                            branch_format = None
 
3562
                            repo_format = None
 
3563
                if branch_format and repo_format:
 
3564
                    # Does support stacking, use its format.
 
3565
                    format.repository_format = repo_format
 
3566
                    format.set_branch_format(branch_format)
 
3567
                    note('Source format does not support stacking, '
 
3568
                        'using format: \'%s\'\n  %s\n',
 
3569
                        branch_format.get_format_description(),
 
3570
                        repo_format.get_format_description())
3810
3571
            if not self._require_stacking:
3811
3572
                # We have picked up automatic stacking somewhere.
3812
3573
                note('Using default stacking branch %s at %s', self._stack_on,
3855
3616
format_registry.register('weave', BzrDirFormat6,
3856
3617
    'Pre-0.8 format.  Slower than knit and does not'
3857
3618
    ' support checkouts or shared repositories.',
3858
 
    hidden=True,
3859
3619
    deprecated=True)
3860
3620
format_registry.register_metadir('metaweave',
3861
3621
    'bzrlib.repofmt.weaverepo.RepositoryFormat7',
3862
3622
    'Transitional format in 0.8.  Slower than knit.',
3863
3623
    branch_format='bzrlib.branch.BzrBranchFormat5',
3864
3624
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3865
 
    hidden=True,
3866
3625
    deprecated=True)
3867
3626
format_registry.register_metadir('knit',
3868
3627
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3869
3628
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
3870
3629
    branch_format='bzrlib.branch.BzrBranchFormat5',
3871
3630
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3872
 
    hidden=True,
3873
3631
    deprecated=True)
3874
3632
format_registry.register_metadir('dirstate',
3875
3633
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3879
3637
    # this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
3880
3638
    # directly from workingtree_4 triggers a circular import.
3881
3639
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3882
 
    hidden=True,
3883
3640
    deprecated=True)
3884
3641
format_registry.register_metadir('dirstate-tags',
3885
3642
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3888
3645
        ' Incompatible with bzr < 0.15.',
3889
3646
    branch_format='bzrlib.branch.BzrBranchFormat6',
3890
3647
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3891
 
    hidden=True,
3892
3648
    deprecated=True)
3893
3649
format_registry.register_metadir('rich-root',
3894
3650
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
3896
3652
        ' bzr < 1.0.',
3897
3653
    branch_format='bzrlib.branch.BzrBranchFormat6',
3898
3654
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3899
 
    hidden=True,
3900
3655
    deprecated=True)
3901
3656
format_registry.register_metadir('dirstate-with-subtree',
3902
3657
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
3913
3668
    help='New in 0.92: Pack-based format with data compatible with '
3914
3669
        'dirstate-tags format repositories. Interoperates with '
3915
3670
        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3916
 
        ,
 
3671
        'Previously called knitpack-experimental.  '
 
3672
        'For more information, see '
 
3673
        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
3917
3674
    branch_format='bzrlib.branch.BzrBranchFormat6',
3918
3675
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3919
3676
    )
3922
3679
    help='New in 0.92: Pack-based format with data compatible with '
3923
3680
        'dirstate-with-subtree format repositories. Interoperates with '
3924
3681
        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3925
 
        ,
 
3682
        'Previously called knitpack-experimental.  '
 
3683
        'For more information, see '
 
3684
        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
3926
3685
    branch_format='bzrlib.branch.BzrBranchFormat6',
3927
3686
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3928
3687
    hidden=True,
3934
3693
         '(needed for bzr-svn and bzr-git).',
3935
3694
    branch_format='bzrlib.branch.BzrBranchFormat6',
3936
3695
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3937
 
    hidden=True,
3938
3696
    )
3939
3697
format_registry.register_metadir('1.6',
3940
3698
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5',
3943
3701
         'not present locally.',
3944
3702
    branch_format='bzrlib.branch.BzrBranchFormat7',
3945
3703
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3946
 
    hidden=True,
3947
3704
    )
3948
3705
format_registry.register_metadir('1.6.1-rich-root',
3949
3706
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
3951
3708
         '(needed for bzr-svn and bzr-git).',
3952
3709
    branch_format='bzrlib.branch.BzrBranchFormat7',
3953
3710
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3954
 
    hidden=True,
3955
3711
    )
3956
3712
format_registry.register_metadir('1.9',
3957
3713
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3960
3716
         'performance for most operations.',
3961
3717
    branch_format='bzrlib.branch.BzrBranchFormat7',
3962
3718
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3963
 
    hidden=True,
3964
3719
    )
3965
3720
format_registry.register_metadir('1.9-rich-root',
3966
3721
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
3968
3723
         '(needed for bzr-svn and bzr-git).',
3969
3724
    branch_format='bzrlib.branch.BzrBranchFormat7',
3970
3725
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3971
 
    hidden=True,
3972
3726
    )
3973
3727
format_registry.register_metadir('1.14',
3974
3728
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3990
3744
        'to and from rich-root-pack (and anything compatible with '
3991
3745
        'rich-root-pack) format repositories. Repositories and branches in '
3992
3746
        'this format can only be read by bzr.dev. Please read '
3993
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
 
3747
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3994
3748
        'before use.',
3995
3749
    branch_format='bzrlib.branch.BzrBranchFormat7',
3996
3750
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3997
3751
    experimental=True,
3998
3752
    alias=True,
3999
 
    hidden=True,
4000
3753
    )
4001
3754
format_registry.register_metadir('development-subtree',
4002
3755
    'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2Subtree',
4004
3757
        'from pack-0.92-subtree (and anything compatible with '
4005
3758
        'pack-0.92-subtree) format repositories. Repositories and branches in '
4006
3759
        'this format can only be read by bzr.dev. Please read '
4007
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
 
3760
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
4008
3761
        'before use.',
4009
3762
    branch_format='bzrlib.branch.BzrBranchFormat7',
4010
3763
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
4011
3764
    experimental=True,
4012
 
    hidden=True,
4013
3765
    alias=False, # Restore to being an alias when an actual development subtree format is added
4014
3766
                 # This current non-alias status is simply because we did not introduce a
4015
3767
                 # chk based subtree format.
4020
3772
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
4021
3773
    help='pack-1.9 with 255-way hashed CHK inv, group compress, rich roots '
4022
3774
        'Please read '
4023
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
4024
 
        'before use.',
4025
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
4026
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
4027
 
    hidden=True,
4028
 
    experimental=True,
4029
 
    )
4030
 
 
4031
 
format_registry.register_metadir('development7-rich-root',
4032
 
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK2',
4033
 
    help='pack-1.9 with 255-way hashed CHK inv, bencode revision, group compress, '
4034
 
        'rich roots. Please read '
4035
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
4036
 
        'before use.',
4037
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
4038
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
4039
 
    hidden=True,
4040
 
    experimental=True,
4041
 
    )
4042
 
 
4043
 
format_registry.register_metadir('2a',
4044
 
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
4045
 
    help='First format for bzr 2.0 series.\n'
4046
 
        'Uses group-compress storage.\n'
4047
 
        'Provides rich roots which are a one-way transition.\n',
4048
 
        # 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
4049
 
        # 'rich roots. Supported by bzr 1.16 and later.',
4050
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
4051
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3775
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
 
3776
        'before use.',
 
3777
    branch_format='bzrlib.branch.BzrBranchFormat7',
 
3778
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3779
    hidden=True,
4052
3780
    experimental=True,
4053
3781
    )
4054
3782
 
4055
3783
# The following format should be an alias for the rich root equivalent 
4056
3784
# of the default format
4057
3785
format_registry.register_metadir('default-rich-root',
4058
 
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
4059
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
4060
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3786
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack4',
 
3787
    help='Default format, rich root variant. (needed for bzr-svn and bzr-git).',
 
3788
    branch_format='bzrlib.branch.BzrBranchFormat6',
 
3789
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4061
3790
    alias=True,
4062
 
    hidden=True,
4063
 
    help='Same as 2a.')
4064
 
 
 
3791
    )
4065
3792
# The current format that is made on 'bzr init'.
4066
 
format_registry.set_default('2a')
 
3793
format_registry.set_default('pack-0.92')