/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: Robert Collins
  • Date: 2009-04-24 05:08:51 UTC
  • mto: This revision was merged to the branch mainline in revision 4304.
  • Revision ID: robertc@robertcollins.net-20090424050851-sdfonaqerfs386t0
Reduce round trips pushing new branches substantially.

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,
287
246
            repo_format_name=repo_format_name,
288
247
            make_working_trees=make_working_trees, shared_repo=want_shared)
289
248
        if repo_format_name:
290
 
            try:
291
 
                # If the result repository is in the same place as the
292
 
                # resulting bzr dir, it will have no content, further if the
293
 
                # result is not stacked then we know all content should be
294
 
                # copied, and finally if we are copying up to a specific
295
 
                # revision_id then we can use the pending-ancestry-result which
296
 
                # 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
299
 
                    revision_id is not None):
300
 
                    fetch_spec = graph.PendingAncestryResult(
301
 
                        [revision_id], local_repo)
302
 
                    result_repo.fetch(local_repo, fetch_spec=fetch_spec)
303
 
                else:
304
 
                    result_repo.fetch(local_repo, revision_id=revision_id)
305
 
            finally:
306
 
                result_repo.unlock()
 
249
            # If the result repository is in the same place as the resulting
 
250
            # bzr dir, it will have no content, further if the result is not stacked
 
251
            # then we know all content should be copied, and finally if we are
 
252
            # copying up to a specific revision_id then we can use the
 
253
            # pending-ancestry-result which does not require traversing all of
 
254
            # history to describe it.
 
255
            if (result_repo.bzrdir.root_transport.base ==
 
256
                result.root_transport.base and not require_stacking and
 
257
                revision_id is not None):
 
258
                fetch_spec = graph.PendingAncestryResult(
 
259
                    [revision_id], local_repo)
 
260
                result_repo.fetch(local_repo, fetch_spec=fetch_spec)
 
261
            else:
 
262
                result_repo.fetch(local_repo, revision_id=revision_id)
307
263
        else:
308
 
            if result_repo is not None:
309
 
                raise AssertionError('result_repo not None(%r)' % result_repo)
 
264
            result_repo = None
310
265
        # 1 if there is a branch present
311
266
        #   make sure its content is available in the target repository
312
267
        #   clone it.
388
343
                for subdir in sorted(subdirs, reverse=True):
389
344
                    pending.append(current_transport.clone(subdir))
390
345
 
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
346
    @staticmethod
401
347
    def find_branches(transport):
402
348
        """Find all branches under a transport.
414
360
            except errors.NoRepositoryPresent:
415
361
                pass
416
362
            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):
 
363
                return False, (None, repository)
 
364
            try:
 
365
                branch = bzrdir.open_branch()
 
366
            except errors.NotBranchError:
 
367
                return True, (None, None)
 
368
            else:
 
369
                return True, (branch, None)
 
370
        branches = []
 
371
        for branch, repo in BzrDir.find_bzrdirs(transport, evaluate=evaluate):
422
372
            if repo is not None:
423
 
                ret.extend(repo.find_branches())
424
 
            if branches is not None:
425
 
                ret.extend(branches)
426
 
        return ret
 
373
                branches.extend(repo.find_branches())
 
374
            if branch is not None:
 
375
                branches.append(branch)
 
376
        return branches
427
377
 
428
378
    def destroy_repository(self):
429
379
        """Destroy the repository in this BzrDir"""
430
380
        raise NotImplementedError(self.destroy_repository)
431
381
 
432
 
    def create_branch(self, name=None):
 
382
    def create_branch(self):
433
383
        """Create a branch in this BzrDir.
434
384
 
435
 
        :param name: Name of the colocated branch to create, None for
436
 
            the default branch.
437
 
 
438
385
        The bzrdir's format will control what branch format is created.
439
386
        For more control see BranchFormatXX.create(a_bzrdir).
440
387
        """
441
388
        raise NotImplementedError(self.create_branch)
442
389
 
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
 
        """
 
390
    def destroy_branch(self):
 
391
        """Destroy the branch in this BzrDir"""
449
392
        raise NotImplementedError(self.destroy_branch)
450
393
 
451
394
    @staticmethod
491
434
            stop = False
492
435
            stack_on = config.get_default_stack_on()
493
436
            if stack_on is not None:
494
 
                stack_on_pwd = found_bzrdir.user_url
 
437
                stack_on_pwd = found_bzrdir.root_transport.base
495
438
                stop = True
496
439
            # does it have a repository ?
497
440
            try:
499
442
            except errors.NoRepositoryPresent:
500
443
                repository = None
501
444
            else:
502
 
                if (found_bzrdir.user_url != self.user_url 
503
 
                    and not repository.is_shared()):
 
445
                if ((found_bzrdir.root_transport.base !=
 
446
                     self.root_transport.base) and not repository.is_shared()):
504
447
                    # Don't look higher, can't use a higher shared repo.
505
448
                    repository = None
506
449
                    stop = True
620
563
 
621
564
        :return: Tuple with old path name and new path name
622
565
        """
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
566
        pb = ui.ui_factory.nested_progress_bar()
633
567
        try:
634
568
            # FIXME: bug 300001 -- the backup fails if the backup directory
635
569
            # already exists, but it should instead either remove it or make
636
570
            # a new backup directory.
637
571
            #
 
572
            # FIXME: bug 262450 -- the backup directory should have the same
 
573
            # permissions as the .bzr directory (probably a bug in copy_tree)
638
574
            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)
 
575
            new_path = self.root_transport.abspath('backup.bzr')
 
576
            pb.note('making backup of %s' % (old_path,))
 
577
            pb.note('  to %s' % (new_path,))
 
578
            self.root_transport.copy_tree('.bzr', 'backup.bzr')
642
579
            return (old_path, new_path)
643
580
        finally:
644
581
            pb.finished()
702
639
            if stop:
703
640
                return result
704
641
            next_transport = found_bzrdir.root_transport.clone('..')
705
 
            if (found_bzrdir.user_url == next_transport.base):
 
642
            if (found_bzrdir.root_transport.base == next_transport.base):
706
643
                # top of the file system
707
644
                return None
708
645
            # find the next containing bzrdir
725
662
                repository = found_bzrdir.open_repository()
726
663
            except errors.NoRepositoryPresent:
727
664
                return None, False
728
 
            if found_bzrdir.user_url == self.user_url:
 
665
            if found_bzrdir.root_transport.base == self.root_transport.base:
729
666
                return repository, True
730
667
            elif repository.is_shared():
731
668
                return repository, True
746
683
        """
747
684
        return None
748
685
 
749
 
    def get_branch_transport(self, branch_format, name=None):
 
686
    def get_branch_transport(self, branch_format):
750
687
        """Get the transport for use by branch format in this BzrDir.
751
688
 
752
689
        Note that bzr dirs that do not support format strings will raise
847
784
        :param _transport: the transport this dir is based at.
848
785
        """
849
786
        self._format = _format
850
 
        # these are also under the more standard names of 
851
 
        # control_transport and user_transport
852
787
        self.transport = _transport.clone('.bzr')
853
788
        self.root_transport = _transport
854
789
        self._mode_check_done = False
855
 
        
856
 
    @property 
857
 
    def user_transport(self):
858
 
        return self.root_transport
859
 
        
860
 
    @property
861
 
    def control_transport(self):
862
 
        return self.transport
863
790
 
864
791
    def is_control_filename(self, filename):
865
792
        """True if filename is the name of a path which is reserved for bzrdir's.
940
867
        BzrDir._check_supported(format, _unsupported)
941
868
        return format.open(transport, _found=True)
942
869
 
943
 
    def open_branch(self, name=None, unsupported=False,
944
 
                    ignore_fallbacks=False):
 
870
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
945
871
        """Open the branch object at this BzrDir if one is present.
946
872
 
947
873
        If unsupported is True, then no longer supported branch formats can
1085
1011
        """
1086
1012
        raise NotImplementedError(self.open_workingtree)
1087
1013
 
1088
 
    def has_branch(self, name=None):
 
1014
    def has_branch(self):
1089
1015
        """Tell if this bzrdir contains a branch.
1090
1016
 
1091
1017
        Note: if you're going to open the branch, you should just go ahead
1093
1019
        branch and discards it, and that's somewhat expensive.)
1094
1020
        """
1095
1021
        try:
1096
 
            self.open_branch(name)
 
1022
            self.open_branch()
1097
1023
            return True
1098
1024
        except errors.NotBranchError:
1099
1025
            return False
1304
1230
        return result
1305
1231
 
1306
1232
    def push_branch(self, source, revision_id=None, overwrite=False, 
1307
 
        remember=False, create_prefix=False):
 
1233
        remember=False):
1308
1234
        """Push the source branch into this BzrDir."""
1309
1235
        br_to = None
1310
1236
        # If we can open a branch, use its direct repository, otherwise see
1373
1299
        self.create_hook(hooks.HookPoint('pre_open',
1374
1300
            "Invoked before attempting to open a BzrDir with the transport "
1375
1301
            "that the open will use.", (1, 14), None))
1376
 
        self.create_hook(hooks.HookPoint('post_repo_init',
1377
 
            "Invoked after a repository has been initialized. "
1378
 
            "post_repo_init is called with a "
1379
 
            "bzrlib.bzrdir.RepoInitHookParams.",
1380
 
            (2, 2), None))
1381
1302
 
1382
1303
# install the default hooks
1383
1304
BzrDir.hooks = BzrDirHooks()
1384
1305
 
1385
1306
 
1386
 
class RepoInitHookParams(object):
1387
 
    """Object holding parameters passed to *_repo_init hooks.
1388
 
 
1389
 
    There are 4 fields that hooks may wish to access:
1390
 
 
1391
 
    :ivar repository: Repository created
1392
 
    :ivar format: Repository format
1393
 
    :ivar bzrdir: The bzrdir for the repository
1394
 
    :ivar shared: The repository is shared
1395
 
    """
1396
 
 
1397
 
    def __init__(self, repository, format, a_bzrdir, shared):
1398
 
        """Create a group of RepoInitHook parameters.
1399
 
 
1400
 
        :param repository: Repository created
1401
 
        :param format: Repository format
1402
 
        :param bzrdir: The bzrdir for the repository
1403
 
        :param shared: The repository is shared
1404
 
        """
1405
 
        self.repository = repository
1406
 
        self.format = format
1407
 
        self.bzrdir = a_bzrdir
1408
 
        self.shared = shared
1409
 
 
1410
 
    def __eq__(self, other):
1411
 
        return self.__dict__ == other.__dict__
1412
 
 
1413
 
    def __repr__(self):
1414
 
        if self.repository:
1415
 
            return "<%s for %s>" % (self.__class__.__name__,
1416
 
                self.repository)
1417
 
        else:
1418
 
            return "<%s for %s>" % (self.__class__.__name__,
1419
 
                self.bzrdir)
1420
 
 
1421
 
 
1422
1307
class BzrDirPreSplitOut(BzrDir):
1423
1308
    """A common class for the all-in-one formats."""
1424
1309
 
1463
1348
            tree.clone(result)
1464
1349
        return result
1465
1350
 
1466
 
    def create_branch(self, name=None):
 
1351
    def create_branch(self):
1467
1352
        """See BzrDir.create_branch."""
1468
 
        return self._format.get_branch_format().initialize(self, name=name)
 
1353
        return self._format.get_branch_format().initialize(self)
1469
1354
 
1470
 
    def destroy_branch(self, name=None):
 
1355
    def destroy_branch(self):
1471
1356
        """See BzrDir.destroy_branch."""
1472
1357
        raise errors.UnsupportedOperation(self.destroy_branch, self)
1473
1358
 
1496
1381
        # that can do wonky stuff here, and that only
1497
1382
        # happens for creating checkouts, which cannot be
1498
1383
        # done on this format anyway. So - acceptable wart.
1499
 
        if hardlink:
1500
 
            warning("can't support hardlinked working trees in %r"
1501
 
                % (self,))
1502
1384
        try:
1503
1385
            result = self.open_workingtree(recommend_upgrade=False)
1504
1386
        except errors.NoSuchFile:
1529
1411
        raise errors.UnsupportedOperation(self.destroy_workingtree_metadata,
1530
1412
                                          self)
1531
1413
 
1532
 
    def get_branch_transport(self, branch_format, name=None):
 
1414
    def get_branch_transport(self, branch_format):
1533
1415
        """See BzrDir.get_branch_transport()."""
1534
 
        if name is not None:
1535
 
            raise errors.NoColocatedBranchSupport(self)
1536
1416
        if branch_format is None:
1537
1417
            return self.transport
1538
1418
        try:
1571
1451
            format = BzrDirFormat.get_default_format()
1572
1452
        return not isinstance(self._format, format.__class__)
1573
1453
 
1574
 
    def open_branch(self, name=None, unsupported=False,
1575
 
                    ignore_fallbacks=False):
 
1454
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
1576
1455
        """See BzrDir.open_branch."""
1577
1456
        from bzrlib.branch import BzrBranchFormat4
1578
1457
        format = BzrBranchFormat4()
1579
1458
        self._check_supported(format, unsupported)
1580
 
        return format.open(self, name, _found=True)
 
1459
        return format.open(self, _found=True)
1581
1460
 
1582
1461
    def sprout(self, url, revision_id=None, force_new_repo=False,
1583
1462
               possible_transports=None, accelerator_tree=None,
1644
1523
    This is a deprecated format and may be removed after sept 2006.
1645
1524
    """
1646
1525
 
1647
 
    def has_workingtree(self):
1648
 
        """See BzrDir.has_workingtree."""
1649
 
        return True
1650
 
    
1651
1526
    def open_repository(self):
1652
1527
        """See BzrDir.open_repository."""
1653
1528
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1669
1544
    This is a deprecated format and may be removed after sept 2006.
1670
1545
    """
1671
1546
 
1672
 
    def has_workingtree(self):
1673
 
        """See BzrDir.has_workingtree."""
1674
 
        return True
1675
 
    
1676
1547
    def open_repository(self):
1677
1548
        """See BzrDir.open_repository."""
1678
1549
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1700
1571
        """See BzrDir.can_convert_format()."""
1701
1572
        return True
1702
1573
 
1703
 
    def create_branch(self, name=None):
 
1574
    def create_branch(self):
1704
1575
        """See BzrDir.create_branch."""
1705
 
        return self._format.get_branch_format().initialize(self, name=name)
 
1576
        return self._format.get_branch_format().initialize(self)
1706
1577
 
1707
 
    def destroy_branch(self, name=None):
 
1578
    def destroy_branch(self):
1708
1579
        """See BzrDir.create_branch."""
1709
 
        if name is not None:
1710
 
            raise errors.NoColocatedBranchSupport(self)
1711
1580
        self.transport.delete_tree('branch')
1712
1581
 
1713
1582
    def create_repository(self, shared=False):
1756
1625
        format = BranchFormat.find_format(self)
1757
1626
        return format.get_reference(self)
1758
1627
 
1759
 
    def get_branch_transport(self, branch_format, name=None):
 
1628
    def get_branch_transport(self, branch_format):
1760
1629
        """See BzrDir.get_branch_transport()."""
1761
 
        if name is not None:
1762
 
            raise errors.NoColocatedBranchSupport(self)
1763
 
        # XXX: this shouldn't implicitly create the directory if it's just
1764
 
        # promising to get a transport -- mbp 20090727
1765
1630
        if branch_format is None:
1766
1631
            return self.transport.clone('branch')
1767
1632
        try:
1802
1667
            pass
1803
1668
        return self.transport.clone('checkout')
1804
1669
 
1805
 
    def has_workingtree(self):
1806
 
        """Tell if this bzrdir contains a working tree.
1807
 
 
1808
 
        This will still raise an exception if the bzrdir has a workingtree that
1809
 
        is remote & inaccessible.
1810
 
 
1811
 
        Note: if you're going to open the working tree, you should just go
1812
 
        ahead and try, and not ask permission first.
1813
 
        """
1814
 
        from bzrlib.workingtree import WorkingTreeFormat
1815
 
        try:
1816
 
            WorkingTreeFormat.find_format(self)
1817
 
        except errors.NoWorkingTree:
1818
 
            return False
1819
 
        return True
1820
 
 
1821
1670
    def needs_format_conversion(self, format=None):
1822
1671
        """See BzrDir.needs_format_conversion()."""
1823
1672
        if format is None:
1836
1685
                return True
1837
1686
        except errors.NoRepositoryPresent:
1838
1687
            pass
1839
 
        for branch in self.list_branches():
1840
 
            if not isinstance(branch._format,
 
1688
        try:
 
1689
            if not isinstance(self.open_branch()._format,
1841
1690
                              format.get_branch_format().__class__):
1842
1691
                # the branch needs an upgrade.
1843
1692
                return True
 
1693
        except errors.NotBranchError:
 
1694
            pass
1844
1695
        try:
1845
1696
            my_wt = self.open_workingtree(recommend_upgrade=False)
1846
1697
            if not isinstance(my_wt._format,
1851
1702
            pass
1852
1703
        return False
1853
1704
 
1854
 
    def open_branch(self, name=None, unsupported=False,
1855
 
                    ignore_fallbacks=False):
 
1705
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
1856
1706
        """See BzrDir.open_branch."""
1857
1707
        format = self.find_branch_format()
1858
1708
        self._check_supported(format, unsupported)
1859
 
        return format.open(self, name=name,
1860
 
            _found=True, ignore_fallbacks=ignore_fallbacks)
 
1709
        return format.open(self, _found=True, ignore_fallbacks=ignore_fallbacks)
1861
1710
 
1862
1711
    def open_repository(self, unsupported=False):
1863
1712
        """See BzrDir.open_repository."""
1895
1744
    Once a format is deprecated, just deprecate the initialize and open
1896
1745
    methods on the format class. Do not deprecate the object, as the
1897
1746
    object will be created every system load.
1898
 
 
1899
 
    :cvar colocated_branches: Whether this formats supports colocated branches.
1900
1747
    """
1901
1748
 
1902
1749
    _default_format = None
1919
1766
 
1920
1767
    _lock_file_name = 'branch-lock'
1921
1768
 
1922
 
    colocated_branches = False
1923
 
    """Whether co-located branches are supported for this control dir format.
1924
 
    """
1925
 
 
1926
1769
    # _lock_class must be set in subclasses to the lock type, typ.
1927
1770
    # TransportLock or LockDir
1928
1771
 
1945
1788
    def probe_transport(klass, transport):
1946
1789
        """Return the .bzrdir style format present in a directory."""
1947
1790
        try:
1948
 
            format_string = transport.get_bytes(".bzr/branch-format")
 
1791
            format_string = transport.get(".bzr/branch-format").read()
1949
1792
        except errors.NoSuchFile:
1950
1793
            raise errors.NotBranchError(path=transport.base)
1951
1794
 
2103
1946
            if not require_stacking and repository_policy._require_stacking:
2104
1947
                require_stacking = True
2105
1948
                result._format.require_stacking()
2106
 
            result_repo.lock_write()
2107
1949
        else:
2108
1950
            result_repo = None
2109
1951
            repository_policy = None
2335
2177
        shared_repo=False):
2336
2178
        """See BzrDirFormat.initialize_on_transport_ex."""
2337
2179
        require_stacking = (stacked_on is not None)
2338
 
        # Format 5 cannot stack, but we've been asked to - actually init
 
2180
        # Format 5 cannot stack, but we've been asked do - actually init
2339
2181
        # a Meta1Dir
2340
2182
        if require_stacking:
2341
2183
            format = BzrDirMetaFormat1()
2511
2353
    def set_branch_format(self, format):
2512
2354
        self._branch_format = format
2513
2355
 
2514
 
    def require_stacking(self, stack_on=None, possible_transports=None,
2515
 
            _skip_repo=False):
2516
 
        """We have a request to stack, try to ensure the formats support it.
2517
 
 
2518
 
        :param stack_on: If supplied, it is the URL to a branch that we want to
2519
 
            stack on. Check to see if that format supports stacking before
2520
 
            forcing an upgrade.
2521
 
        """
2522
 
        # Stacking is desired. requested by the target, but does the place it
2523
 
        # points at support stacking? If it doesn't then we should
2524
 
        # not implicitly upgrade. We check this here.
2525
 
        new_repo_format = None
2526
 
        new_branch_format = None
2527
 
 
2528
 
        # a bit of state for get_target_branch so that we don't try to open it
2529
 
        # 2 times, for both repo *and* branch
2530
 
        target = [None, False, None] # target_branch, checked, upgrade anyway
2531
 
        def get_target_branch():
2532
 
            if target[1]:
2533
 
                # We've checked, don't check again
2534
 
                return target
2535
 
            if stack_on is None:
2536
 
                # No target format, that means we want to force upgrading
2537
 
                target[:] = [None, True, True]
2538
 
                return target
2539
 
            try:
2540
 
                target_dir = BzrDir.open(stack_on,
2541
 
                    possible_transports=possible_transports)
2542
 
            except errors.NotBranchError:
2543
 
                # Nothing there, don't change formats
2544
 
                target[:] = [None, True, False]
2545
 
                return target
2546
 
            except errors.JailBreak:
2547
 
                # JailBreak, JFDI and upgrade anyway
2548
 
                target[:] = [None, True, True]
2549
 
                return target
2550
 
            try:
2551
 
                target_branch = target_dir.open_branch()
2552
 
            except errors.NotBranchError:
2553
 
                # No branch, don't upgrade formats
2554
 
                target[:] = [None, True, False]
2555
 
                return target
2556
 
            target[:] = [target_branch, True, False]
2557
 
            return target
2558
 
 
2559
 
        if (not _skip_repo and
2560
 
                 not self.repository_format.supports_external_lookups):
2561
 
            # We need to upgrade the Repository.
2562
 
            target_branch, _, do_upgrade = get_target_branch()
2563
 
            if target_branch is None:
2564
 
                # We don't have a target branch, should we upgrade anyway?
2565
 
                if do_upgrade:
2566
 
                    # stack_on is inaccessible, JFDI.
2567
 
                    # TODO: bad monkey, hard-coded formats...
2568
 
                    if self.repository_format.rich_root_data:
2569
 
                        new_repo_format = pack_repo.RepositoryFormatKnitPack5RichRoot()
2570
 
                    else:
2571
 
                        new_repo_format = pack_repo.RepositoryFormatKnitPack5()
2572
 
            else:
2573
 
                # If the target already supports stacking, then we know the
2574
 
                # project is already able to use stacking, so auto-upgrade
2575
 
                # for them
2576
 
                new_repo_format = target_branch.repository._format
2577
 
                if not new_repo_format.supports_external_lookups:
2578
 
                    # target doesn't, source doesn't, so don't auto upgrade
2579
 
                    # repo
2580
 
                    new_repo_format = None
2581
 
            if new_repo_format is not None:
2582
 
                self.repository_format = new_repo_format
2583
 
                note('Source repository format does not support stacking,'
2584
 
                     ' using format:\n  %s',
2585
 
                     new_repo_format.get_format_description())
2586
 
 
 
2356
    def require_stacking(self):
2587
2357
        if not self.get_branch_format().supports_stacking():
2588
 
            # We just checked the repo, now lets check if we need to
2589
 
            # upgrade the branch format
2590
 
            target_branch, _, do_upgrade = get_target_branch()
2591
 
            if target_branch is None:
2592
 
                if do_upgrade:
2593
 
                    # TODO: bad monkey, hard-coded formats...
2594
 
                    new_branch_format = branch.BzrBranchFormat7()
 
2358
            # We need to make a stacked branch, but the default format for the
 
2359
            # target doesn't support stacking.  So force a branch that *can*
 
2360
            # support stacking.
 
2361
            from bzrlib.branch import BzrBranchFormat7
 
2362
            branch_format = BzrBranchFormat7()
 
2363
            self.set_branch_format(branch_format)
 
2364
            mutter("using %r for stacking" % (branch_format,))
 
2365
            from bzrlib.repofmt import pack_repo
 
2366
            if self.repository_format.rich_root_data:
 
2367
                bzrdir_format_name = '1.6.1-rich-root'
 
2368
                repo_format = pack_repo.RepositoryFormatKnitPack5RichRoot()
2595
2369
            else:
2596
 
                new_branch_format = target_branch._format
2597
 
                if not new_branch_format.supports_stacking():
2598
 
                    new_branch_format = None
2599
 
            if new_branch_format is not None:
2600
 
                # Does support stacking, use its format.
2601
 
                self.set_branch_format(new_branch_format)
2602
 
                note('Source branch format does not support stacking,'
2603
 
                     ' using format:\n  %s',
2604
 
                     new_branch_format.get_format_description())
 
2370
                bzrdir_format_name = '1.6'
 
2371
                repo_format = pack_repo.RepositoryFormatKnitPack5()
 
2372
            note('Source format does not support stacking, using format:'
 
2373
                 ' \'%s\'\n  %s\n',
 
2374
                 bzrdir_format_name, repo_format.get_format_description())
 
2375
            self.repository_format = repo_format
2605
2376
 
2606
2377
    def get_converter(self, format=None):
2607
2378
        """See BzrDirFormat.get_converter()."""
2625
2396
 
2626
2397
    def _open(self, transport):
2627
2398
        """See BzrDirFormat._open."""
2628
 
        # Create a new format instance because otherwise initialisation of new
2629
 
        # metadirs share the global default format object leading to alias
2630
 
        # problems.
2631
 
        format = BzrDirMetaFormat1()
2632
 
        self._supply_sub_formats_to(format)
2633
 
        return BzrDirMeta1(transport, format)
 
2399
        return BzrDirMeta1(transport, self)
2634
2400
 
2635
2401
    def __return_repository_format(self):
2636
2402
        """Circular import protection."""
2727
2493
    def convert(self, to_convert, pb):
2728
2494
        """See Converter.convert()."""
2729
2495
        self.bzrdir = to_convert
2730
 
        if pb is not None:
2731
 
            warnings.warn("pb parameter to convert() is deprecated")
2732
 
        self.pb = ui.ui_factory.nested_progress_bar()
2733
 
        try:
2734
 
            ui.ui_factory.note('starting upgrade from format 4 to 5')
2735
 
            if isinstance(self.bzrdir.transport, local.LocalTransport):
2736
 
                self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
2737
 
            self._convert_to_weaves()
2738
 
            return BzrDir.open(self.bzrdir.user_url)
2739
 
        finally:
2740
 
            self.pb.finished()
 
2496
        self.pb = pb
 
2497
        self.pb.note('starting upgrade from format 4 to 5')
 
2498
        if isinstance(self.bzrdir.transport, local.LocalTransport):
 
2499
            self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
 
2500
        self._convert_to_weaves()
 
2501
        return BzrDir.open(self.bzrdir.root_transport.base)
2741
2502
 
2742
2503
    def _convert_to_weaves(self):
2743
 
        ui.ui_factory.note('note: upgrade may be faster if all store files are ungzipped first')
 
2504
        self.pb.note('note: upgrade may be faster if all store files are ungzipped first')
2744
2505
        try:
2745
2506
            # TODO permissions
2746
2507
            stat = self.bzrdir.transport.stat('weaves')
2774
2535
        self.pb.clear()
2775
2536
        self._write_all_weaves()
2776
2537
        self._write_all_revs()
2777
 
        ui.ui_factory.note('upgraded to weaves:')
2778
 
        ui.ui_factory.note('  %6d revisions and inventories' % len(self.revisions))
2779
 
        ui.ui_factory.note('  %6d revisions not present' % len(self.absent_revisions))
2780
 
        ui.ui_factory.note('  %6d texts' % self.text_count)
 
2538
        self.pb.note('upgraded to weaves:')
 
2539
        self.pb.note('  %6d revisions and inventories', len(self.revisions))
 
2540
        self.pb.note('  %6d revisions not present', len(self.absent_revisions))
 
2541
        self.pb.note('  %6d texts', self.text_count)
2781
2542
        self._cleanup_spare_files_after_format4()
2782
2543
        self.branch._transport.put_bytes(
2783
2544
            'branch-format',
2851
2612
                       len(self.known_revisions))
2852
2613
        if not self.branch.repository.has_revision(rev_id):
2853
2614
            self.pb.clear()
2854
 
            ui.ui_factory.note('revision {%s} not present in branch; '
2855
 
                         'will be converted as a ghost' %
 
2615
            self.pb.note('revision {%s} not present in branch; '
 
2616
                         'will be converted as a ghost',
2856
2617
                         rev_id)
2857
2618
            self.absent_revisions.add(rev_id)
2858
2619
        else:
2928
2689
        del ie.text_id
2929
2690
 
2930
2691
    def get_parent_map(self, revision_ids):
2931
 
        """See graph.StackedParentsProvider.get_parent_map"""
 
2692
        """See graph._StackedParentsProvider.get_parent_map"""
2932
2693
        return dict((revision_id, self.revisions[revision_id])
2933
2694
                    for revision_id in revision_ids
2934
2695
                     if revision_id in self.revisions)
2984
2745
    def convert(self, to_convert, pb):
2985
2746
        """See Converter.convert()."""
2986
2747
        self.bzrdir = to_convert
2987
 
        pb = ui.ui_factory.nested_progress_bar()
2988
 
        try:
2989
 
            ui.ui_factory.note('starting upgrade from format 5 to 6')
2990
 
            self._convert_to_prefixed()
2991
 
            return BzrDir.open(self.bzrdir.user_url)
2992
 
        finally:
2993
 
            pb.finished()
 
2748
        self.pb = pb
 
2749
        self.pb.note('starting upgrade from format 5 to 6')
 
2750
        self._convert_to_prefixed()
 
2751
        return BzrDir.open(self.bzrdir.root_transport.base)
2994
2752
 
2995
2753
    def _convert_to_prefixed(self):
2996
2754
        from bzrlib.store import TransportStore
2997
2755
        self.bzrdir.transport.delete('branch-format')
2998
2756
        for store_name in ["weaves", "revision-store"]:
2999
 
            ui.ui_factory.note("adding prefixes to %s" % store_name)
 
2757
            self.pb.note("adding prefixes to %s" % store_name)
3000
2758
            store_transport = self.bzrdir.transport.clone(store_name)
3001
2759
            store = TransportStore(store_transport, prefixed=True)
3002
2760
            for urlfilename in store_transport.list_dir('.'):
3029
2787
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
3030
2788
        from bzrlib.branch import BzrBranchFormat5
3031
2789
        self.bzrdir = to_convert
3032
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
2790
        self.pb = pb
3033
2791
        self.count = 0
3034
2792
        self.total = 20 # the steps we know about
3035
2793
        self.garbage_inventories = []
3036
2794
        self.dir_mode = self.bzrdir._get_dir_mode()
3037
2795
        self.file_mode = self.bzrdir._get_file_mode()
3038
2796
 
3039
 
        ui.ui_factory.note('starting upgrade from format 6 to metadir')
 
2797
        self.pb.note('starting upgrade from format 6 to metadir')
3040
2798
        self.bzrdir.transport.put_bytes(
3041
2799
                'branch-format',
3042
2800
                "Converting to format 6",
3092
2850
        else:
3093
2851
            has_checkout = True
3094
2852
        if not has_checkout:
3095
 
            ui.ui_factory.note('No working tree.')
 
2853
            self.pb.note('No working tree.')
3096
2854
            # If some checkout files are there, we may as well get rid of them.
3097
2855
            for name, mandatory in checkout_files:
3098
2856
                if name in bzrcontents:
3115
2873
            'branch-format',
3116
2874
            BzrDirMetaFormat1().get_format_string(),
3117
2875
            mode=self.file_mode)
3118
 
        self.pb.finished()
3119
 
        return BzrDir.open(self.bzrdir.user_url)
 
2876
        return BzrDir.open(self.bzrdir.root_transport.base)
3120
2877
 
3121
2878
    def make_lock(self, name):
3122
2879
        """Make a lock for the new control dir name."""
3157
2914
    def convert(self, to_convert, pb):
3158
2915
        """See Converter.convert()."""
3159
2916
        self.bzrdir = to_convert
3160
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
2917
        self.pb = pb
3161
2918
        self.count = 0
3162
2919
        self.total = 1
3163
2920
        self.step('checking repository format')
3168
2925
        else:
3169
2926
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
3170
2927
                from bzrlib.repository import CopyConverter
3171
 
                ui.ui_factory.note('starting repository conversion')
 
2928
                self.pb.note('starting repository conversion')
3172
2929
                converter = CopyConverter(self.target_format.repository_format)
3173
2930
                converter.convert(repo, pb)
3174
 
        for branch in self.bzrdir.list_branches():
 
2931
        try:
 
2932
            branch = self.bzrdir.open_branch()
 
2933
        except errors.NotBranchError:
 
2934
            pass
 
2935
        else:
3175
2936
            # TODO: conversions of Branch and Tree should be done by
3176
2937
            # InterXFormat lookups/some sort of registry.
3177
2938
            # Avoid circular imports
3181
2942
            while old != new:
3182
2943
                if (old == _mod_branch.BzrBranchFormat5 and
3183
2944
                    new in (_mod_branch.BzrBranchFormat6,
3184
 
                        _mod_branch.BzrBranchFormat7,
3185
 
                        _mod_branch.BzrBranchFormat8)):
 
2945
                        _mod_branch.BzrBranchFormat7)):
3186
2946
                    branch_converter = _mod_branch.Converter5to6()
3187
2947
                elif (old == _mod_branch.BzrBranchFormat6 and
3188
 
                    new in (_mod_branch.BzrBranchFormat7,
3189
 
                            _mod_branch.BzrBranchFormat8)):
 
2948
                    new == _mod_branch.BzrBranchFormat7):
3190
2949
                    branch_converter = _mod_branch.Converter6to7()
3191
 
                elif (old == _mod_branch.BzrBranchFormat7 and
3192
 
                      new is _mod_branch.BzrBranchFormat8):
3193
 
                    branch_converter = _mod_branch.Converter7to8()
3194
2950
                else:
3195
 
                    raise errors.BadConversionTarget("No converter", new,
3196
 
                        branch._format)
 
2951
                    raise errors.BadConversionTarget("No converter", new)
3197
2952
                branch_converter.convert(branch)
3198
2953
                branch = self.bzrdir.open_branch()
3199
2954
                old = branch._format.__class__
3219
2974
                isinstance(self.target_format.workingtree_format,
3220
2975
                    workingtree_4.WorkingTreeFormat6)):
3221
2976
                workingtree_4.Converter4or5to6().convert(tree)
3222
 
        self.pb.finished()
3223
2977
        return to_convert
3224
2978
 
3225
2979
 
3232
2986
 
3233
2987
    def __init__(self):
3234
2988
        BzrDirMetaFormat1.__init__(self)
3235
 
        # XXX: It's a bit ugly that the network name is here, because we'd
3236
 
        # like to believe that format objects are stateless or at least
3237
 
        # immutable,  However, we do at least avoid mutating the name after
3238
 
        # it's returned.  See <https://bugs.edge.launchpad.net/bzr/+bug/504102>
3239
2989
        self._network_name = None
3240
2990
 
3241
 
    def __repr__(self):
3242
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
3243
 
            self._network_name)
3244
 
 
3245
2991
    def get_format_description(self):
3246
 
        if self._network_name:
3247
 
            real_format = network_format_registry.get(self._network_name)
3248
 
            return 'Remote: ' + real_format.get_format_description()
3249
2992
        return 'bzr remote bzrdir'
3250
2993
 
3251
2994
    def get_format_string(self):
3291
3034
            return local_dir_format.initialize_on_transport(transport)
3292
3035
        client = _SmartClient(client_medium)
3293
3036
        path = client.remote_path_from_transport(transport)
3294
 
        try:
3295
 
            response = client.call('BzrDirFormat.initialize', path)
3296
 
        except errors.ErrorFromSmartServer, err:
3297
 
            remote._translate_error(err, path=path)
 
3037
        response = client.call('BzrDirFormat.initialize', path)
3298
3038
        if response[0] != 'ok':
3299
3039
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
3300
3040
        format = RemoteBzrDirFormat()
3328
3068
            # hand off the request to the smart server
3329
3069
            client_medium = transport.get_smart_medium()
3330
3070
        except errors.NoSmartMedium:
3331
 
            do_vfs = True
3332
 
        else:
3333
 
            # Decline to open it if the server doesn't support our required
3334
 
            # version (3) so that the VFS-based transport will do it.
3335
 
            if client_medium.should_probe():
3336
 
                try:
3337
 
                    server_version = client_medium.protocol_version()
3338
 
                    if server_version != '2':
3339
 
                        do_vfs = True
3340
 
                    else:
3341
 
                        do_vfs = False
3342
 
                except errors.SmartProtocolError:
3343
 
                    # Apparently there's no usable smart server there, even though
3344
 
                    # the medium supports the smart protocol.
3345
 
                    do_vfs = True
3346
 
            else:
3347
 
                do_vfs = False
3348
 
        if not do_vfs:
3349
 
            client = _SmartClient(client_medium)
3350
 
            path = client.remote_path_from_transport(transport)
3351
 
            if client_medium._is_remote_before((1, 16)):
3352
 
                do_vfs = True
3353
 
        if do_vfs:
3354
3071
            # TODO: lookup the local format from a server hint.
3355
3072
            local_dir_format = BzrDirMetaFormat1()
3356
3073
            self._supply_sub_formats_to(local_dir_format)
3358
3075
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
3359
3076
                force_new_repo=force_new_repo, stacked_on=stacked_on,
3360
3077
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
 
3078
                make_working_trees=make_working_trees, shared_repo=shared_repo)
 
3079
        client = _SmartClient(client_medium)
 
3080
        path = client.remote_path_from_transport(transport)
 
3081
        if client_medium._is_remote_before((1, 15)):
 
3082
            local_dir_format = BzrDirMetaFormat1()
 
3083
            self._supply_sub_formats_to(local_dir_format)
 
3084
            return local_dir_format.initialize_on_transport_ex(transport,
 
3085
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
 
3086
                force_new_repo=force_new_repo, stacked_on=stacked_on,
 
3087
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3361
3088
                make_working_trees=make_working_trees, shared_repo=shared_repo,
3362
3089
                vfs_only=True)
3363
 
        return self._initialize_on_transport_ex_rpc(client, path, transport,
3364
 
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
3365
 
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
3366
 
 
3367
 
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
3368
 
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
3369
 
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
3370
3090
        args = []
3371
3091
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
3372
3092
        args.append(self._serialize_NoneTrueFalse(create_prefix))
3384
3104
        args.append(self._serialize_NoneString(repo_format_name))
3385
3105
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
3386
3106
        args.append(self._serialize_NoneTrueFalse(shared_repo))
3387
 
        request_network_name = self._network_name or \
 
3107
        if self._network_name is None:
 
3108
            self._network_name = \
3388
3109
            BzrDirFormat.get_default_format().network_name()
3389
3110
        try:
3390
 
            response = client.call('BzrDirFormat.initialize_ex_1.16',
3391
 
                request_network_name, path, *args)
 
3111
            response = client.call('BzrDirFormat.initialize_ex',
 
3112
                self.network_name(), path, *args)
3392
3113
        except errors.UnknownSmartMethod:
3393
 
            client._medium._remember_remote_is_before((1,16))
3394
3114
            local_dir_format = BzrDirMetaFormat1()
3395
3115
            self._supply_sub_formats_to(local_dir_format)
3396
3116
            return local_dir_format.initialize_on_transport_ex(transport,
3399
3119
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3400
3120
                make_working_trees=make_working_trees, shared_repo=shared_repo,
3401
3121
                vfs_only=True)
3402
 
        except errors.ErrorFromSmartServer, err:
3403
 
            remote._translate_error(err, path=path)
3404
3122
        repo_path = response[0]
3405
3123
        bzrdir_name = response[6]
3406
3124
        require_stacking = response[7]
3408
3126
        format = RemoteBzrDirFormat()
3409
3127
        format._network_name = bzrdir_name
3410
3128
        self._supply_sub_formats_to(format)
3411
 
        bzrdir = remote.RemoteBzrDir(transport, format, _client=client)
 
3129
        bzrdir = remote.RemoteBzrDir(transport, format)
3412
3130
        if repo_path:
3413
3131
            repo_format = remote.response_tuple_to_repo_format(response[1:])
3414
3132
            if repo_path == '.':
3422
3140
                repo_bzr = bzrdir
3423
3141
            final_stack = response[8] or None
3424
3142
            final_stack_pwd = response[9] or None
3425
 
            if final_stack_pwd:
3426
 
                final_stack_pwd = urlutils.join(
3427
 
                    transport.base, final_stack_pwd)
3428
3143
            remote_repo = remote.RemoteRepository(repo_bzr, repo_format)
3429
 
            if len(response) > 10:
3430
 
                # Updated server verb that locks remotely.
3431
 
                repo_lock_token = response[10] or None
3432
 
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
3433
 
                if repo_lock_token:
3434
 
                    remote_repo.dont_leave_lock_in_place()
3435
 
            else:
3436
 
                remote_repo.lock_write()
3437
3144
            policy = UseExistingRepository(remote_repo, final_stack,
3438
3145
                final_stack_pwd, require_stacking)
3439
3146
            policy.acquire_repository()
3440
3147
        else:
3441
3148
            remote_repo = None
3442
3149
            policy = None
3443
 
        bzrdir._format.set_branch_format(self.get_branch_format())
3444
 
        if require_stacking:
3445
 
            # The repo has already been created, but we need to make sure that
3446
 
            # we'll make a stackable branch.
3447
 
            bzrdir._format.require_stacking(_skip_repo=True)
3448
3150
        return remote_repo, bzrdir, require_stacking, policy
3449
3151
 
3450
3152
    def _open(self, transport):
3626
3328
            if info.native:
3627
3329
                help = '(native) ' + help
3628
3330
            return ':%s:\n%s\n\n' % (key,
3629
 
                textwrap.fill(help, initial_indent='    ',
3630
 
                    subsequent_indent='    ',
3631
 
                    break_long_words=False))
 
3331
                    textwrap.fill(help, initial_indent='    ',
 
3332
                    subsequent_indent='    '))
3632
3333
        if default_realkey is not None:
3633
3334
            output += wrapped(default_realkey, '(default) %s' % default_help,
3634
3335
                              self.get_info('default'))
3644
3345
                experimental_pairs.append((key, help))
3645
3346
            else:
3646
3347
                output += wrapped(key, help, info)
3647
 
        output += "\nSee :doc:`formats-help` for more about storage formats."
 
3348
        output += "\nSee ``bzr help formats`` for more about storage formats."
3648
3349
        other_output = ""
3649
3350
        if len(experimental_pairs) > 0:
3650
3351
            other_output += "Experimental formats are shown below.\n\n"
3663
3364
            other_output += \
3664
3365
                "\nNo deprecated formats are available.\n\n"
3665
3366
        other_output += \
3666
 
                "\nSee :doc:`formats-help` for more about storage formats."
 
3367
            "\nSee ``bzr help formats`` for more about storage formats."
3667
3368
 
3668
3369
        if topic == 'other-formats':
3669
3370
            return other_output
3703
3404
            try:
3704
3405
                stack_on = urlutils.rebase_url(self._stack_on,
3705
3406
                    self._stack_on_pwd,
3706
 
                    branch.user_url)
 
3407
                    branch.bzrdir.root_transport.base)
3707
3408
            except errors.InvalidRebaseURLs:
3708
3409
                stack_on = self._get_full_stack_on()
3709
3410
        try:
3713
3414
            if self._require_stacking:
3714
3415
                raise
3715
3416
 
3716
 
    def requires_stacking(self):
3717
 
        """Return True if this policy requires stacking."""
3718
 
        return self._stack_on is not None and self._require_stacking
3719
 
 
3720
3417
    def _get_full_stack_on(self):
3721
3418
        """Get a fully-qualified URL for the stack_on location."""
3722
3419
        if self._stack_on is None:
3787
3484
        """
3788
3485
        stack_on = self._get_full_stack_on()
3789
3486
        if stack_on:
 
3487
            # Stacking is desired. requested by the target, but does the place it
 
3488
            # points at support stacking? If it doesn't then we should
 
3489
            # not implicitly upgrade. We check this here.
3790
3490
            format = self._bzrdir._format
3791
 
            format.require_stacking(stack_on=stack_on,
3792
 
                                    possible_transports=[self._bzrdir.root_transport])
 
3491
            if not (format.repository_format.supports_external_lookups
 
3492
                and format.get_branch_format().supports_stacking()):
 
3493
                # May need to upgrade - but only do if the target also
 
3494
                # supports stacking. Note that this currently wastes
 
3495
                # network round trips to check - but we only do this
 
3496
                # when the source can't stack so it will fade away
 
3497
                # as people do upgrade.
 
3498
                branch_format = None
 
3499
                repo_format = None
 
3500
                try:
 
3501
                    target_dir = BzrDir.open(stack_on,
 
3502
                        possible_transports=[self._bzrdir.root_transport])
 
3503
                except errors.NotBranchError:
 
3504
                    # Nothing there, don't change formats
 
3505
                    pass
 
3506
                except errors.JailBreak:
 
3507
                    # stack_on is inaccessible, JFDI.
 
3508
                    if format.repository_format.rich_root_data:
 
3509
                        repo_format = pack_repo.RepositoryFormatKnitPack6RichRoot()
 
3510
                    else:
 
3511
                        repo_format = pack_repo.RepositoryFormatKnitPack6()
 
3512
                    branch_format = branch.BzrBranchFormat7()
 
3513
                else:
 
3514
                    try:
 
3515
                        target_branch = target_dir.open_branch()
 
3516
                    except errors.NotBranchError:
 
3517
                        # No branch, don't change formats
 
3518
                        pass
 
3519
                    else:
 
3520
                        branch_format = target_branch._format
 
3521
                        repo_format = target_branch.repository._format
 
3522
                        if not (branch_format.supports_stacking()
 
3523
                            and repo_format.supports_external_lookups):
 
3524
                            # Doesn't stack itself, don't force an upgrade
 
3525
                            branch_format = None
 
3526
                            repo_format = None
 
3527
                if branch_format and repo_format:
 
3528
                    # Does support stacking, use its format.
 
3529
                    format.repository_format = repo_format
 
3530
                    format.set_branch_format(branch_format)
 
3531
                    note('Source format does not support stacking, '
 
3532
                        'using format: \'%s\'\n  %s\n',
 
3533
                        branch_format.get_format_description(),
 
3534
                        repo_format.get_format_description())
3793
3535
            if not self._require_stacking:
3794
3536
                # We have picked up automatic stacking somewhere.
3795
3537
                note('Using default stacking branch %s at %s', self._stack_on,
3838
3580
format_registry.register('weave', BzrDirFormat6,
3839
3581
    'Pre-0.8 format.  Slower than knit and does not'
3840
3582
    ' support checkouts or shared repositories.',
3841
 
    hidden=True,
3842
3583
    deprecated=True)
3843
3584
format_registry.register_metadir('metaweave',
3844
3585
    'bzrlib.repofmt.weaverepo.RepositoryFormat7',
3845
3586
    'Transitional format in 0.8.  Slower than knit.',
3846
3587
    branch_format='bzrlib.branch.BzrBranchFormat5',
3847
3588
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3848
 
    hidden=True,
3849
3589
    deprecated=True)
3850
3590
format_registry.register_metadir('knit',
3851
3591
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3852
3592
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
3853
3593
    branch_format='bzrlib.branch.BzrBranchFormat5',
3854
3594
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3855
 
    hidden=True,
3856
3595
    deprecated=True)
3857
3596
format_registry.register_metadir('dirstate',
3858
3597
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3862
3601
    # this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
3863
3602
    # directly from workingtree_4 triggers a circular import.
3864
3603
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3865
 
    hidden=True,
3866
3604
    deprecated=True)
3867
3605
format_registry.register_metadir('dirstate-tags',
3868
3606
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3871
3609
        ' Incompatible with bzr < 0.15.',
3872
3610
    branch_format='bzrlib.branch.BzrBranchFormat6',
3873
3611
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3874
 
    hidden=True,
3875
3612
    deprecated=True)
3876
3613
format_registry.register_metadir('rich-root',
3877
3614
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
3879
3616
        ' bzr < 1.0.',
3880
3617
    branch_format='bzrlib.branch.BzrBranchFormat6',
3881
3618
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3882
 
    hidden=True,
3883
3619
    deprecated=True)
3884
3620
format_registry.register_metadir('dirstate-with-subtree',
3885
3621
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
3896
3632
    help='New in 0.92: Pack-based format with data compatible with '
3897
3633
        'dirstate-tags format repositories. Interoperates with '
3898
3634
        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3899
 
        ,
 
3635
        'Previously called knitpack-experimental.  '
 
3636
        'For more information, see '
 
3637
        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
3900
3638
    branch_format='bzrlib.branch.BzrBranchFormat6',
3901
3639
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3902
3640
    )
3905
3643
    help='New in 0.92: Pack-based format with data compatible with '
3906
3644
        'dirstate-with-subtree format repositories. Interoperates with '
3907
3645
        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3908
 
        ,
 
3646
        'Previously called knitpack-experimental.  '
 
3647
        'For more information, see '
 
3648
        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
3909
3649
    branch_format='bzrlib.branch.BzrBranchFormat6',
3910
3650
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3911
3651
    hidden=True,
3917
3657
         '(needed for bzr-svn and bzr-git).',
3918
3658
    branch_format='bzrlib.branch.BzrBranchFormat6',
3919
3659
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3920
 
    hidden=True,
3921
3660
    )
3922
3661
format_registry.register_metadir('1.6',
3923
3662
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5',
3926
3665
         'not present locally.',
3927
3666
    branch_format='bzrlib.branch.BzrBranchFormat7',
3928
3667
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3929
 
    hidden=True,
3930
3668
    )
3931
3669
format_registry.register_metadir('1.6.1-rich-root',
3932
3670
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
3934
3672
         '(needed for bzr-svn and bzr-git).',
3935
3673
    branch_format='bzrlib.branch.BzrBranchFormat7',
3936
3674
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3937
 
    hidden=True,
3938
3675
    )
3939
3676
format_registry.register_metadir('1.9',
3940
3677
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3943
3680
         'performance for most operations.',
3944
3681
    branch_format='bzrlib.branch.BzrBranchFormat7',
3945
3682
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3946
 
    hidden=True,
3947
3683
    )
3948
3684
format_registry.register_metadir('1.9-rich-root',
3949
3685
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
3951
3687
         '(needed for bzr-svn and bzr-git).',
3952
3688
    branch_format='bzrlib.branch.BzrBranchFormat7',
3953
3689
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3954
 
    hidden=True,
3955
3690
    )
3956
3691
format_registry.register_metadir('1.14',
3957
3692
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3973
3708
        'to and from rich-root-pack (and anything compatible with '
3974
3709
        'rich-root-pack) format repositories. Repositories and branches in '
3975
3710
        'this format can only be read by bzr.dev. Please read '
3976
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
 
3711
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3977
3712
        'before use.',
3978
3713
    branch_format='bzrlib.branch.BzrBranchFormat7',
3979
3714
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3980
3715
    experimental=True,
3981
3716
    alias=True,
3982
 
    hidden=True,
3983
3717
    )
3984
3718
format_registry.register_metadir('development-subtree',
3985
3719
    'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2Subtree',
3987
3721
        'from pack-0.92-subtree (and anything compatible with '
3988
3722
        'pack-0.92-subtree) format repositories. Repositories and branches in '
3989
3723
        'this format can only be read by bzr.dev. Please read '
3990
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
 
3724
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3991
3725
        'before use.',
3992
3726
    branch_format='bzrlib.branch.BzrBranchFormat7',
3993
3727
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3994
3728
    experimental=True,
3995
 
    hidden=True,
3996
3729
    alias=False, # Restore to being an alias when an actual development subtree format is added
3997
3730
                 # This current non-alias status is simply because we did not introduce a
3998
3731
                 # chk based subtree format.
4003
3736
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
4004
3737
    help='pack-1.9 with 255-way hashed CHK inv, group compress, rich roots '
4005
3738
        'Please read '
4006
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
4007
 
        'before use.',
4008
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
4009
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
4010
 
    hidden=True,
4011
 
    experimental=True,
4012
 
    )
4013
 
 
4014
 
format_registry.register_metadir('development7-rich-root',
4015
 
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK2',
4016
 
    help='pack-1.9 with 255-way hashed CHK inv, bencode revision, group compress, '
4017
 
        'rich roots. Please read '
4018
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
4019
 
        'before use.',
4020
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
4021
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
4022
 
    hidden=True,
4023
 
    experimental=True,
4024
 
    )
4025
 
 
4026
 
format_registry.register_metadir('2a',
4027
 
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
4028
 
    help='First format for bzr 2.0 series.\n'
4029
 
        'Uses group-compress storage.\n'
4030
 
        'Provides rich roots which are a one-way transition.\n',
4031
 
        # 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
4032
 
        # 'rich roots. Supported by bzr 1.16 and later.',
4033
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
4034
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3739
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
 
3740
        'before use.',
 
3741
    branch_format='bzrlib.branch.BzrBranchFormat7',
 
3742
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3743
    hidden=True,
4035
3744
    experimental=True,
4036
3745
    )
4037
3746
 
4038
3747
# The following format should be an alias for the rich root equivalent 
4039
3748
# of the default format
4040
3749
format_registry.register_metadir('default-rich-root',
4041
 
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
4042
 
    branch_format='bzrlib.branch.BzrBranchFormat7',
4043
 
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
 
3750
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack4',
 
3751
    help='Default format, rich root variant. (needed for bzr-svn and bzr-git).',
 
3752
    branch_format='bzrlib.branch.BzrBranchFormat6',
 
3753
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
4044
3754
    alias=True,
4045
 
    hidden=True,
4046
 
    help='Same as 2a.')
4047
 
 
 
3755
    )
4048
3756
# The current format that is made on 'bzr init'.
4049
 
format_registry.set_default('2a')
 
3757
format_registry.set_default('pack-0.92')