← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2009-05-15 02:36:03 UTC
  • mto: This revision was merged to the branch mainline in revision 4369.
  • Revision ID: jelmer@samba.org-20090515023603-x7jsmtb5h66y7efp
Import malloc and friends from stdlib.h rather than from (deprecated) malloc.h.

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
746
687
        """
747
688
        return None
748
689
 
749
 
    def get_branch_transport(self, branch_format, name=None):
 
690
    def get_branch_transport(self, branch_format):
750
691
        """Get the transport for use by branch format in this BzrDir.
751
692
 
752
693
        Note that bzr dirs that do not support format strings will raise
847
788
        :param _transport: the transport this dir is based at.
848
789
        """
849
790
        self._format = _format
850
 
        # these are also under the more standard names of 
851
 
        # control_transport and user_transport
852
791
        self.transport = _transport.clone('.bzr')
853
792
        self.root_transport = _transport
854
793
        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
794
 
864
795
    def is_control_filename(self, filename):
865
796
        """True if filename is the name of a path which is reserved for bzrdir's.
940
871
        BzrDir._check_supported(format, _unsupported)
941
872
        return format.open(transport, _found=True)
942
873
 
943
 
    def open_branch(self, name=None, unsupported=False,
944
 
                    ignore_fallbacks=False):
 
874
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
945
875
        """Open the branch object at this BzrDir if one is present.
946
876
 
947
877
        If unsupported is True, then no longer supported branch formats can
1085
1015
        """
1086
1016
        raise NotImplementedError(self.open_workingtree)
1087
1017
 
1088
 
    def has_branch(self, name=None):
 
1018
    def has_branch(self):
1089
1019
        """Tell if this bzrdir contains a branch.
1090
1020
 
1091
1021
        Note: if you're going to open the branch, you should just go ahead
1093
1023
        branch and discards it, and that's somewhat expensive.)
1094
1024
        """
1095
1025
        try:
1096
 
            self.open_branch(name)
 
1026
            self.open_branch()
1097
1027
            return True
1098
1028
        except errors.NotBranchError:
1099
1029
            return False
1304
1234
        return result
1305
1235
 
1306
1236
    def push_branch(self, source, revision_id=None, overwrite=False, 
1307
 
        remember=False, create_prefix=False):
 
1237
        remember=False):
1308
1238
        """Push the source branch into this BzrDir."""
1309
1239
        br_to = None
1310
1240
        # If we can open a branch, use its direct repository, otherwise see
1373
1303
        self.create_hook(hooks.HookPoint('pre_open',
1374
1304
            "Invoked before attempting to open a BzrDir with the transport "
1375
1305
            "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
1306
 
1382
1307
# install the default hooks
1383
1308
BzrDir.hooks = BzrDirHooks()
1384
1309
 
1385
1310
 
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
1311
class BzrDirPreSplitOut(BzrDir):
1423
1312
    """A common class for the all-in-one formats."""
1424
1313
 
1463
1352
            tree.clone(result)
1464
1353
        return result
1465
1354
 
1466
 
    def create_branch(self, name=None):
 
1355
    def create_branch(self):
1467
1356
        """See BzrDir.create_branch."""
1468
 
        return self._format.get_branch_format().initialize(self, name=name)
 
1357
        return self._format.get_branch_format().initialize(self)
1469
1358
 
1470
 
    def destroy_branch(self, name=None):
 
1359
    def destroy_branch(self):
1471
1360
        """See BzrDir.destroy_branch."""
1472
1361
        raise errors.UnsupportedOperation(self.destroy_branch, self)
1473
1362
 
1496
1385
        # that can do wonky stuff here, and that only
1497
1386
        # happens for creating checkouts, which cannot be
1498
1387
        # done on this format anyway. So - acceptable wart.
1499
 
        if hardlink:
1500
 
            warning("can't support hardlinked working trees in %r"
1501
 
                % (self,))
1502
1388
        try:
1503
1389
            result = self.open_workingtree(recommend_upgrade=False)
1504
1390
        except errors.NoSuchFile:
1529
1415
        raise errors.UnsupportedOperation(self.destroy_workingtree_metadata,
1530
1416
                                          self)
1531
1417
 
1532
 
    def get_branch_transport(self, branch_format, name=None):
 
1418
    def get_branch_transport(self, branch_format):
1533
1419
        """See BzrDir.get_branch_transport()."""
1534
 
        if name is not None:
1535
 
            raise errors.NoColocatedBranchSupport(self)
1536
1420
        if branch_format is None:
1537
1421
            return self.transport
1538
1422
        try:
1571
1455
            format = BzrDirFormat.get_default_format()
1572
1456
        return not isinstance(self._format, format.__class__)
1573
1457
 
1574
 
    def open_branch(self, name=None, unsupported=False,
1575
 
                    ignore_fallbacks=False):
 
1458
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
1576
1459
        """See BzrDir.open_branch."""
1577
1460
        from bzrlib.branch import BzrBranchFormat4
1578
1461
        format = BzrBranchFormat4()
1579
1462
        self._check_supported(format, unsupported)
1580
 
        return format.open(self, name, _found=True)
 
1463
        return format.open(self, _found=True)
1581
1464
 
1582
1465
    def sprout(self, url, revision_id=None, force_new_repo=False,
1583
1466
               possible_transports=None, accelerator_tree=None,
1644
1527
    This is a deprecated format and may be removed after sept 2006.
1645
1528
    """
1646
1529
 
1647
 
    def has_workingtree(self):
1648
 
        """See BzrDir.has_workingtree."""
1649
 
        return True
1650
 
    
1651
1530
    def open_repository(self):
1652
1531
        """See BzrDir.open_repository."""
1653
1532
        from bzrlib.repofmt.weaverepo import RepositoryFormat5
1669
1548
    This is a deprecated format and may be removed after sept 2006.
1670
1549
    """
1671
1550
 
1672
 
    def has_workingtree(self):
1673
 
        """See BzrDir.has_workingtree."""
1674
 
        return True
1675
 
    
1676
1551
    def open_repository(self):
1677
1552
        """See BzrDir.open_repository."""
1678
1553
        from bzrlib.repofmt.weaverepo import RepositoryFormat6
1700
1575
        """See BzrDir.can_convert_format()."""
1701
1576
        return True
1702
1577
 
1703
 
    def create_branch(self, name=None):
 
1578
    def create_branch(self):
1704
1579
        """See BzrDir.create_branch."""
1705
 
        return self._format.get_branch_format().initialize(self, name=name)
 
1580
        return self._format.get_branch_format().initialize(self)
1706
1581
 
1707
 
    def destroy_branch(self, name=None):
 
1582
    def destroy_branch(self):
1708
1583
        """See BzrDir.create_branch."""
1709
 
        if name is not None:
1710
 
            raise errors.NoColocatedBranchSupport(self)
1711
1584
        self.transport.delete_tree('branch')
1712
1585
 
1713
1586
    def create_repository(self, shared=False):
1756
1629
        format = BranchFormat.find_format(self)
1757
1630
        return format.get_reference(self)
1758
1631
 
1759
 
    def get_branch_transport(self, branch_format, name=None):
 
1632
    def get_branch_transport(self, branch_format):
1760
1633
        """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
1634
        if branch_format is None:
1766
1635
            return self.transport.clone('branch')
1767
1636
        try:
1802
1671
            pass
1803
1672
        return self.transport.clone('checkout')
1804
1673
 
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
1674
    def needs_format_conversion(self, format=None):
1822
1675
        """See BzrDir.needs_format_conversion()."""
1823
1676
        if format is None:
1836
1689
                return True
1837
1690
        except errors.NoRepositoryPresent:
1838
1691
            pass
1839
 
        for branch in self.list_branches():
1840
 
            if not isinstance(branch._format,
 
1692
        try:
 
1693
            if not isinstance(self.open_branch()._format,
1841
1694
                              format.get_branch_format().__class__):
1842
1695
                # the branch needs an upgrade.
1843
1696
                return True
 
1697
        except errors.NotBranchError:
 
1698
            pass
1844
1699
        try:
1845
1700
            my_wt = self.open_workingtree(recommend_upgrade=False)
1846
1701
            if not isinstance(my_wt._format,
1851
1706
            pass
1852
1707
        return False
1853
1708
 
1854
 
    def open_branch(self, name=None, unsupported=False,
1855
 
                    ignore_fallbacks=False):
 
1709
    def open_branch(self, unsupported=False, ignore_fallbacks=False):
1856
1710
        """See BzrDir.open_branch."""
1857
1711
        format = self.find_branch_format()
1858
1712
        self._check_supported(format, unsupported)
1859
 
        return format.open(self, name=name,
1860
 
            _found=True, ignore_fallbacks=ignore_fallbacks)
 
1713
        return format.open(self, _found=True, ignore_fallbacks=ignore_fallbacks)
1861
1714
 
1862
1715
    def open_repository(self, unsupported=False):
1863
1716
        """See BzrDir.open_repository."""
1895
1748
    Once a format is deprecated, just deprecate the initialize and open
1896
1749
    methods on the format class. Do not deprecate the object, as the
1897
1750
    object will be created every system load.
1898
 
 
1899
 
    :cvar colocated_branches: Whether this formats supports colocated branches.
1900
1751
    """
1901
1752
 
1902
1753
    _default_format = None
1919
1770
 
1920
1771
    _lock_file_name = 'branch-lock'
1921
1772
 
1922
 
    colocated_branches = False
1923
 
    """Whether co-located branches are supported for this control dir format.
1924
 
    """
1925
 
 
1926
1773
    # _lock_class must be set in subclasses to the lock type, typ.
1927
1774
    # TransportLock or LockDir
1928
1775
 
1945
1792
    def probe_transport(klass, transport):
1946
1793
        """Return the .bzrdir style format present in a directory."""
1947
1794
        try:
1948
 
            format_string = transport.get_bytes(".bzr/branch-format")
 
1795
            format_string = transport.get(".bzr/branch-format").read()
1949
1796
        except errors.NoSuchFile:
1950
1797
            raise errors.NotBranchError(path=transport.base)
1951
1798
 
2511
2358
    def set_branch_format(self, format):
2512
2359
        self._branch_format = format
2513
2360
 
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
 
 
 
2361
    def require_stacking(self):
2587
2362
        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()
 
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()
2595
2374
            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())
 
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
2605
2381
 
2606
2382
    def get_converter(self, format=None):
2607
2383
        """See BzrDirFormat.get_converter()."""
2727
2503
    def convert(self, to_convert, pb):
2728
2504
        """See Converter.convert()."""
2729
2505
        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()
 
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)
2741
2512
 
2742
2513
    def _convert_to_weaves(self):
2743
 
        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')
2744
2515
        try:
2745
2516
            # TODO permissions
2746
2517
            stat = self.bzrdir.transport.stat('weaves')
2774
2545
        self.pb.clear()
2775
2546
        self._write_all_weaves()
2776
2547
        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)
 
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)
2781
2552
        self._cleanup_spare_files_after_format4()
2782
2553
        self.branch._transport.put_bytes(
2783
2554
            'branch-format',
2851
2622
                       len(self.known_revisions))
2852
2623
        if not self.branch.repository.has_revision(rev_id):
2853
2624
            self.pb.clear()
2854
 
            ui.ui_factory.note('revision {%s} not present in branch; '
2855
 
                         'will be converted as a ghost' %
 
2625
            self.pb.note('revision {%s} not present in branch; '
 
2626
                         'will be converted as a ghost',
2856
2627
                         rev_id)
2857
2628
            self.absent_revisions.add(rev_id)
2858
2629
        else:
2928
2699
        del ie.text_id
2929
2700
 
2930
2701
    def get_parent_map(self, revision_ids):
2931
 
        """See graph.StackedParentsProvider.get_parent_map"""
 
2702
        """See graph._StackedParentsProvider.get_parent_map"""
2932
2703
        return dict((revision_id, self.revisions[revision_id])
2933
2704
                    for revision_id in revision_ids
2934
2705
                     if revision_id in self.revisions)
2984
2755
    def convert(self, to_convert, pb):
2985
2756
        """See Converter.convert()."""
2986
2757
        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()
 
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)
2994
2762
 
2995
2763
    def _convert_to_prefixed(self):
2996
2764
        from bzrlib.store import TransportStore
2997
2765
        self.bzrdir.transport.delete('branch-format')
2998
2766
        for store_name in ["weaves", "revision-store"]:
2999
 
            ui.ui_factory.note("adding prefixes to %s" % store_name)
 
2767
            self.pb.note("adding prefixes to %s" % store_name)
3000
2768
            store_transport = self.bzrdir.transport.clone(store_name)
3001
2769
            store = TransportStore(store_transport, prefixed=True)
3002
2770
            for urlfilename in store_transport.list_dir('.'):
3029
2797
        from bzrlib.repofmt.weaverepo import RepositoryFormat7
3030
2798
        from bzrlib.branch import BzrBranchFormat5
3031
2799
        self.bzrdir = to_convert
3032
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
2800
        self.pb = pb
3033
2801
        self.count = 0
3034
2802
        self.total = 20 # the steps we know about
3035
2803
        self.garbage_inventories = []
3036
2804
        self.dir_mode = self.bzrdir._get_dir_mode()
3037
2805
        self.file_mode = self.bzrdir._get_file_mode()
3038
2806
 
3039
 
        ui.ui_factory.note('starting upgrade from format 6 to metadir')
 
2807
        self.pb.note('starting upgrade from format 6 to metadir')
3040
2808
        self.bzrdir.transport.put_bytes(
3041
2809
                'branch-format',
3042
2810
                "Converting to format 6",
3092
2860
        else:
3093
2861
            has_checkout = True
3094
2862
        if not has_checkout:
3095
 
            ui.ui_factory.note('No working tree.')
 
2863
            self.pb.note('No working tree.')
3096
2864
            # If some checkout files are there, we may as well get rid of them.
3097
2865
            for name, mandatory in checkout_files:
3098
2866
                if name in bzrcontents:
3115
2883
            'branch-format',
3116
2884
            BzrDirMetaFormat1().get_format_string(),
3117
2885
            mode=self.file_mode)
3118
 
        self.pb.finished()
3119
 
        return BzrDir.open(self.bzrdir.user_url)
 
2886
        return BzrDir.open(self.bzrdir.root_transport.base)
3120
2887
 
3121
2888
    def make_lock(self, name):
3122
2889
        """Make a lock for the new control dir name."""
3157
2924
    def convert(self, to_convert, pb):
3158
2925
        """See Converter.convert()."""
3159
2926
        self.bzrdir = to_convert
3160
 
        self.pb = ui.ui_factory.nested_progress_bar()
 
2927
        self.pb = pb
3161
2928
        self.count = 0
3162
2929
        self.total = 1
3163
2930
        self.step('checking repository format')
3168
2935
        else:
3169
2936
            if not isinstance(repo._format, self.target_format.repository_format.__class__):
3170
2937
                from bzrlib.repository import CopyConverter
3171
 
                ui.ui_factory.note('starting repository conversion')
 
2938
                self.pb.note('starting repository conversion')
3172
2939
                converter = CopyConverter(self.target_format.repository_format)
3173
2940
                converter.convert(repo, pb)
3174
 
        for branch in self.bzrdir.list_branches():
 
2941
        try:
 
2942
            branch = self.bzrdir.open_branch()
 
2943
        except errors.NotBranchError:
 
2944
            pass
 
2945
        else:
3175
2946
            # TODO: conversions of Branch and Tree should be done by
3176
2947
            # InterXFormat lookups/some sort of registry.
3177
2948
            # Avoid circular imports
3192
2963
                      new is _mod_branch.BzrBranchFormat8):
3193
2964
                    branch_converter = _mod_branch.Converter7to8()
3194
2965
                else:
3195
 
                    raise errors.BadConversionTarget("No converter", new,
3196
 
                        branch._format)
 
2966
                    raise errors.BadConversionTarget("No converter", new)
3197
2967
                branch_converter.convert(branch)
3198
2968
                branch = self.bzrdir.open_branch()
3199
2969
                old = branch._format.__class__
3219
2989
                isinstance(self.target_format.workingtree_format,
3220
2990
                    workingtree_4.WorkingTreeFormat6)):
3221
2991
                workingtree_4.Converter4or5to6().convert(tree)
3222
 
        self.pb.finished()
3223
2992
        return to_convert
3224
2993
 
3225
2994
 
3232
3001
 
3233
3002
    def __init__(self):
3234
3003
        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
3004
        self._network_name = None
3240
3005
 
3241
 
    def __repr__(self):
3242
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
3243
 
            self._network_name)
3244
 
 
3245
3006
    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
3007
        return 'bzr remote bzrdir'
3250
3008
 
3251
3009
    def get_format_string(self):
3291
3049
            return local_dir_format.initialize_on_transport(transport)
3292
3050
        client = _SmartClient(client_medium)
3293
3051
        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)
 
3052
        response = client.call('BzrDirFormat.initialize', path)
3298
3053
        if response[0] != 'ok':
3299
3054
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
3300
3055
        format = RemoteBzrDirFormat()
3348
3103
        if not do_vfs:
3349
3104
            client = _SmartClient(client_medium)
3350
3105
            path = client.remote_path_from_transport(transport)
3351
 
            if client_medium._is_remote_before((1, 16)):
 
3106
            if client_medium._is_remote_before((1, 15)):
3352
3107
                do_vfs = True
3353
3108
        if do_vfs:
3354
3109
            # TODO: lookup the local format from a server hint.
3360
3115
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3361
3116
                make_working_trees=make_working_trees, shared_repo=shared_repo,
3362
3117
                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
3118
        args = []
3371
3119
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
3372
3120
        args.append(self._serialize_NoneTrueFalse(create_prefix))
3384
3132
        args.append(self._serialize_NoneString(repo_format_name))
3385
3133
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
3386
3134
        args.append(self._serialize_NoneTrueFalse(shared_repo))
3387
 
        request_network_name = self._network_name or \
 
3135
        if self._network_name is None:
 
3136
            self._network_name = \
3388
3137
            BzrDirFormat.get_default_format().network_name()
3389
3138
        try:
3390
 
            response = client.call('BzrDirFormat.initialize_ex_1.16',
3391
 
                request_network_name, path, *args)
 
3139
            response = client.call('BzrDirFormat.initialize_ex',
 
3140
                self.network_name(), path, *args)
3392
3141
        except errors.UnknownSmartMethod:
3393
 
            client._medium._remember_remote_is_before((1,16))
3394
3142
            local_dir_format = BzrDirMetaFormat1()
3395
3143
            self._supply_sub_formats_to(local_dir_format)
3396
3144
            return local_dir_format.initialize_on_transport_ex(transport,
3399
3147
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
3400
3148
                make_working_trees=make_working_trees, shared_repo=shared_repo,
3401
3149
                vfs_only=True)
3402
 
        except errors.ErrorFromSmartServer, err:
3403
 
            remote._translate_error(err, path=path)
3404
3150
        repo_path = response[0]
3405
3151
        bzrdir_name = response[6]
3406
3152
        require_stacking = response[7]
3422
3168
                repo_bzr = bzrdir
3423
3169
            final_stack = response[8] or None
3424
3170
            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
3171
            remote_repo = remote.RemoteRepository(repo_bzr, repo_format)
3429
3172
            if len(response) > 10:
3430
3173
                # Updated server verb that locks remotely.
3440
3183
        else:
3441
3184
            remote_repo = None
3442
3185
            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
3186
        return remote_repo, bzrdir, require_stacking, policy
3449
3187
 
3450
3188
    def _open(self, transport):
3626
3364
            if info.native:
3627
3365
                help = '(native) ' + help
3628
3366
            return ':%s:\n%s\n\n' % (key,
3629
 
                textwrap.fill(help, initial_indent='    ',
3630
 
                    subsequent_indent='    ',
3631
 
                    break_long_words=False))
 
3367
                    textwrap.fill(help, initial_indent='    ',
 
3368
                    subsequent_indent='    '))
3632
3369
        if default_realkey is not None:
3633
3370
            output += wrapped(default_realkey, '(default) %s' % default_help,
3634
3371
                              self.get_info('default'))
3644
3381
                experimental_pairs.append((key, help))
3645
3382
            else:
3646
3383
                output += wrapped(key, help, info)
3647
 
        output += "\nSee :doc:`formats-help` for more about storage formats."
 
3384
        output += "\nSee ``bzr help formats`` for more about storage formats."
3648
3385
        other_output = ""
3649
3386
        if len(experimental_pairs) > 0:
3650
3387
            other_output += "Experimental formats are shown below.\n\n"
3663
3400
            other_output += \
3664
3401
                "\nNo deprecated formats are available.\n\n"
3665
3402
        other_output += \
3666
 
                "\nSee :doc:`formats-help` for more about storage formats."
 
3403
            "\nSee ``bzr help formats`` for more about storage formats."
3667
3404
 
3668
3405
        if topic == 'other-formats':
3669
3406
            return other_output
3703
3440
            try:
3704
3441
                stack_on = urlutils.rebase_url(self._stack_on,
3705
3442
                    self._stack_on_pwd,
3706
 
                    branch.user_url)
 
3443
                    branch.bzrdir.root_transport.base)
3707
3444
            except errors.InvalidRebaseURLs:
3708
3445
                stack_on = self._get_full_stack_on()
3709
3446
        try:
3713
3450
            if self._require_stacking:
3714
3451
                raise
3715
3452
 
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
3453
    def _get_full_stack_on(self):
3721
3454
        """Get a fully-qualified URL for the stack_on location."""
3722
3455
        if self._stack_on is None:
3787
3520
        """
3788
3521
        stack_on = self._get_full_stack_on()
3789
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.
3790
3526
            format = self._bzrdir._format
3791
 
            format.require_stacking(stack_on=stack_on,
3792
 
                                    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())
3793
3571
            if not self._require_stacking:
3794
3572
                # We have picked up automatic stacking somewhere.
3795
3573
                note('Using default stacking branch %s at %s', self._stack_on,
3838
3616
format_registry.register('weave', BzrDirFormat6,
3839
3617
    'Pre-0.8 format.  Slower than knit and does not'
3840
3618
    ' support checkouts or shared repositories.',
3841
 
    hidden=True,
3842
3619
    deprecated=True)
3843
3620
format_registry.register_metadir('metaweave',
3844
3621
    'bzrlib.repofmt.weaverepo.RepositoryFormat7',
3845
3622
    'Transitional format in 0.8.  Slower than knit.',
3846
3623
    branch_format='bzrlib.branch.BzrBranchFormat5',
3847
3624
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3848
 
    hidden=True,
3849
3625
    deprecated=True)
3850
3626
format_registry.register_metadir('knit',
3851
3627
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3852
3628
    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
3853
3629
    branch_format='bzrlib.branch.BzrBranchFormat5',
3854
3630
    tree_format='bzrlib.workingtree.WorkingTreeFormat3',
3855
 
    hidden=True,
3856
3631
    deprecated=True)
3857
3632
format_registry.register_metadir('dirstate',
3858
3633
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3862
3637
    # this uses bzrlib.workingtree.WorkingTreeFormat4 because importing
3863
3638
    # directly from workingtree_4 triggers a circular import.
3864
3639
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3865
 
    hidden=True,
3866
3640
    deprecated=True)
3867
3641
format_registry.register_metadir('dirstate-tags',
3868
3642
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
3871
3645
        ' Incompatible with bzr < 0.15.',
3872
3646
    branch_format='bzrlib.branch.BzrBranchFormat6',
3873
3647
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3874
 
    hidden=True,
3875
3648
    deprecated=True)
3876
3649
format_registry.register_metadir('rich-root',
3877
3650
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit4',
3879
3652
        ' bzr < 1.0.',
3880
3653
    branch_format='bzrlib.branch.BzrBranchFormat6',
3881
3654
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3882
 
    hidden=True,
3883
3655
    deprecated=True)
3884
3656
format_registry.register_metadir('dirstate-with-subtree',
3885
3657
    'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
3896
3668
    help='New in 0.92: Pack-based format with data compatible with '
3897
3669
        'dirstate-tags format repositories. Interoperates with '
3898
3670
        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3899
 
        ,
 
3671
        'Previously called knitpack-experimental.  '
 
3672
        'For more information, see '
 
3673
        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
3900
3674
    branch_format='bzrlib.branch.BzrBranchFormat6',
3901
3675
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3902
3676
    )
3905
3679
    help='New in 0.92: Pack-based format with data compatible with '
3906
3680
        'dirstate-with-subtree format repositories. Interoperates with '
3907
3681
        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
3908
 
        ,
 
3682
        'Previously called knitpack-experimental.  '
 
3683
        'For more information, see '
 
3684
        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
3909
3685
    branch_format='bzrlib.branch.BzrBranchFormat6',
3910
3686
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3911
3687
    hidden=True,
3917
3693
         '(needed for bzr-svn and bzr-git).',
3918
3694
    branch_format='bzrlib.branch.BzrBranchFormat6',
3919
3695
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3920
 
    hidden=True,
3921
3696
    )
3922
3697
format_registry.register_metadir('1.6',
3923
3698
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5',
3926
3701
         'not present locally.',
3927
3702
    branch_format='bzrlib.branch.BzrBranchFormat7',
3928
3703
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3929
 
    hidden=True,
3930
3704
    )
3931
3705
format_registry.register_metadir('1.6.1-rich-root',
3932
3706
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
3934
3708
         '(needed for bzr-svn and bzr-git).',
3935
3709
    branch_format='bzrlib.branch.BzrBranchFormat7',
3936
3710
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3937
 
    hidden=True,
3938
3711
    )
3939
3712
format_registry.register_metadir('1.9',
3940
3713
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3943
3716
         'performance for most operations.',
3944
3717
    branch_format='bzrlib.branch.BzrBranchFormat7',
3945
3718
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3946
 
    hidden=True,
3947
3719
    )
3948
3720
format_registry.register_metadir('1.9-rich-root',
3949
3721
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6RichRoot',
3951
3723
         '(needed for bzr-svn and bzr-git).',
3952
3724
    branch_format='bzrlib.branch.BzrBranchFormat7',
3953
3725
    tree_format='bzrlib.workingtree.WorkingTreeFormat4',
3954
 
    hidden=True,
3955
3726
    )
3956
3727
format_registry.register_metadir('1.14',
3957
3728
    'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack6',
3973
3744
        'to and from rich-root-pack (and anything compatible with '
3974
3745
        'rich-root-pack) format repositories. Repositories and branches in '
3975
3746
        'this format can only be read by bzr.dev. Please read '
3976
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
 
3747
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3977
3748
        'before use.',
3978
3749
    branch_format='bzrlib.branch.BzrBranchFormat7',
3979
3750
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3980
3751
    experimental=True,
3981
3752
    alias=True,
3982
 
    hidden=True,
3983
3753
    )
3984
3754
format_registry.register_metadir('development-subtree',
3985
3755
    'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment2Subtree',
3987
3757
        'from pack-0.92-subtree (and anything compatible with '
3988
3758
        'pack-0.92-subtree) format repositories. Repositories and branches in '
3989
3759
        'this format can only be read by bzr.dev. Please read '
3990
 
        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
 
3760
        'http://doc.bazaar-vcs.org/latest/developers/development-repo.html '
3991
3761
        'before use.',
3992
3762
    branch_format='bzrlib.branch.BzrBranchFormat7',
3993
3763
    tree_format='bzrlib.workingtree.WorkingTreeFormat6',
3994
3764
    experimental=True,
3995
 
    hidden=True,
3996
3765
    alias=False, # Restore to being an alias when an actual development subtree format is added
3997
3766
                 # This current non-alias status is simply because we did not introduce a
3998
3767
                 # chk based subtree format.
4003
3772
    'bzrlib.repofmt.groupcompress_repo.RepositoryFormatCHK1',
4004
3773
    help='pack-1.9 with 255-way hashed CHK inv, group compress, rich roots '
4005
3774
        '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',
 
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,
4035
3780
    experimental=True,
4036
3781
    )
4037
3782
 
4038
3783
# The following format should be an alias for the rich root equivalent 
4039
3784
# of the default format
4040
3785
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',
 
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',
4044
3790
    alias=True,
4045
 
    hidden=True,
4046
 
    help='Same as 2a.')
4047
 
 
 
3791
    )
4048
3792
# The current format that is made on 'bzr init'.
4049
 
format_registry.set_default('2a')
 
3793
format_registry.set_default('pack-0.92')