To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Robert Collins
- Date: 2008-01-06 20:04:22 UTC
- mto: (3221.11.1 StackableBranch)
- Revision ID: robertc@robertcollins.net-20080106200422-x8yz6cxotlzltvwp
The bzrdir format registry now accepts an ``alias`` keyword to
register_metadir, used to indicate that a format name is an alias for
some other format and thus should not be reported when describing the
format. (Robert Collins)
-------------- This line and the fmllowing will be ignored --------------
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/info.py
bzrlib/tests/test_bzrdir.py
bzrlib/tests/test_info.py
=== modified file 'NEWS'
--- a/NEWS 2008-01-02 22:30:46 +0000
+++ b/NEWS 2008-01-06 20:04:15 +0000
@@ -135,6 +135,11 @@
* Patience Diff now supports arbitrary python objects, as long as they
support ``hash()``. (John Arbash Meinel)
+ * The bzrdir format registry now accepts an ``alias`` keyword to
+ register_metadir, used to indicate that a format name is an alias for
+ some other format and thus should not be reported when describing the
+ format. (Robert Collins)
+
API BREAKS:
TESTING:
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-01-02 22:30:46 +0000
+++ b/bzrlib/bzrdir.py 2008-01-06 19:41:29 +0000
@@ -2447,12 +2447,22 @@
e.g. BzrDirMeta1 with weave repository. Also, it's more user-oriented.
"""
+ def __init__(self):
+ """Create a BzrDirFormatRegistry."""
+ self._aliases = set()
+ super(BzrDirFormatRegistry, self).__init__()
+
+ def aliases(self):
+ """Return a set of the format names which are aliases."""
+ return frozenset(self._aliases)
+
def register_metadir(self, key,
repository_format, help, native=True, deprecated=False,
branch_format=None,
tree_format=None,
hidden=False,
- experimental=False):
+ experimental=False,
+ alias=False):
"""Register a metadir subformat.
These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
@@ -2491,10 +2501,10 @@
bd.repository_format = _load(repository_format)
return bd
self.register(key, helper, help, native, deprecated, hidden,
- experimental)
+ experimental, alias)
def register(self, key, factory, help, native=True, deprecated=False,
- hidden=False, experimental=False):
+ hidden=False, experimental=False, alias=False):
"""Register a BzrDirFormat factory.
The factory must be a callable that takes one parameter: the key.
@@ -2505,11 +2515,15 @@
"""
registry.Registry.register(self, key, factory, help,
BzrDirFormatInfo(native, deprecated, hidden, experimental))
+ if alias:
+ self._aliases.add(key)
def register_lazy(self, key, module_name, member_name, help, native=True,
- deprecated=False, hidden=False, experimental=False):
+ deprecated=False, hidden=False, experimental=False, alias=False):
registry.Registry.register_lazy(self, key, module_name, member_name,
help, BzrDirFormatInfo(native, deprecated, hidden, experimental))
+ if alias:
+ self._aliases.add(key)
def set_default(self, key):
"""Set the 'default' key to be a clone of the supplied key.
@@ -2518,6 +2532,7 @@
"""
registry.Registry.register(self, 'default', self.get(key),
self.get_help(key), info=self.get_info(key))
+ self._aliases.add('default')
def set_default_repository(self, key):
"""Set the FormatRegistry default and Repository default.
@@ -2670,6 +2685,7 @@
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
hidden=False,
)
+# The following two formats should always just be aliases.
format_registry.register_metadir('development',
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
help='Current development format. Can convert data to and from pack-0.92 '
@@ -2681,6 +2697,7 @@
branch_format='bzrlib.branch.BzrBranchFormat6',
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
experimental=True,
+ alias=True,
)
format_registry.register_metadir('development-subtree',
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0Subtree',
@@ -2693,7 +2710,9 @@
branch_format='bzrlib.branch.BzrBranchFormat6',
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
experimental=True,
+ alias=True,
)
+# And the development formats which the will have aliased one of follow:
format_registry.register_metadir('development0',
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
help='Trivial rename of pack-0.92 to provide a development format. '
=== modified file 'bzrlib/info.py'
--- a/bzrlib/info.py 2007-11-06 09:00:25 +0000
+++ b/bzrlib/info.py 2008-01-06 20:01:30 +0000
@@ -440,7 +440,9 @@
tree.bzrdir.root_transport.base):
branch = None
repository = None
- for key in bzrdir.format_registry.keys():
+ non_aliases = set(bzrdir.format_registry.keys())
+ non_aliases.difference_update(bzrdir.format_registry.aliases())
+ for key in non_aliases:
format = bzrdir.format_registry.make_bzrdir(key)
if isinstance(format, bzrdir.BzrDirMetaFormat1):
if (tree and format.workingtree_format !=
@@ -457,11 +459,12 @@
candidates.append(key)
if len(candidates) == 0:
return 'unnamed'
- new_candidates = [c for c in candidates if c != 'default']
- if len(new_candidates) > 0:
- candidates = new_candidates
+ candidates.sort()
new_candidates = [c for c in candidates if not
bzrdir.format_registry.get_info(c).hidden]
if len(new_candidates) > 0:
+ # If there are any non-hidden formats that match, only return those to
+ # avoid listing hidden formats except when only a hidden format will
+ # do.
candidates = new_candidates
return ' or '.join(candidates)
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2007-12-21 20:32:22 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2008-01-06 19:45:00 +0000
@@ -170,6 +170,16 @@
finally:
bzrdir.format_registry.set_default_repository(old_default)
+ def test_aliases(self):
+ a_registry = bzrdir.BzrDirFormatRegistry()
+ a_registry.register('weave', bzrdir.BzrDirFormat6,
+ 'Pre-0.8 format. Slower and does not support checkouts or shared'
+ ' repositories', deprecated=True)
+ a_registry.register('weavealias', bzrdir.BzrDirFormat6,
+ 'Pre-0.8 format. Slower and does not support checkouts or shared'
+ ' repositories', deprecated=True, alias=True)
+ self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
+
class SampleBranch(bzrlib.branch.Branch):
"""A dummy branch for guess what, dummy use."""
=== modified file 'bzrlib/tests/test_info.py'
--- a/bzrlib/tests/test_info.py 2007-11-26 13:55:51 +0000
+++ b/bzrlib/tests/test_info.py 2008-01-06 20:02:10 +0000
@@ -126,16 +126,22 @@
def test_describe_tree_format(self):
for key in bzrdir.format_registry.keys():
- if key == 'default':
+ if key in bzrdir.format_registry.aliases():
continue
self.assertTreeDescription(key)
def test_describe_checkout_format(self):
for key in bzrdir.format_registry.keys():
- if key in ('default', 'weave', 'experimental'):
- continue
- if key.startswith('experimental-'):
- # these are typically hidden or aliases for other formats
+ if key in bzrdir.format_registry.aliases():
+ # Aliases will not describe correctly in the UI because the
+ # real format is found.
+ continue
+ # legacy: weave does not support checkouts
+ if key == 'weave':
+ continue
+ if bzrdir.format_registry.get_info(key).experimental:
+ # We don't require that experimental formats support checkouts
+ # or describe correctly in the UI.
continue
expected = None
if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
@@ -149,7 +155,7 @@
def test_describe_branch_format(self):
for key in bzrdir.format_registry.keys():
- if key == 'default':
+ if key in bzrdir.format_registry.aliases():
continue
expected = None
if key in ('dirstate', 'knit'):
@@ -158,7 +164,7 @@
def test_describe_repo_format(self):
for key in bzrdir.format_registry.keys():
- if key == 'default':
+ if key in bzrdir.format_registry.aliases():
continue
expected = None
if key in ('dirstate', 'knit', 'dirstate-tags'):
register_metadir, used to indicate that a format name is an alias for
some other format and thus should not be reported when describing the
format. (Robert Collins)
-------------- This line and the fmllowing will be ignored --------------
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/info.py
bzrlib/tests/test_bzrdir.py
bzrlib/tests/test_info.py
=== modified file 'NEWS'
--- a/NEWS 2008-01-02 22:30:46 +0000
+++ b/NEWS 2008-01-06 20:04:15 +0000
@@ -135,6 +135,11 @@
* Patience Diff now supports arbitrary python objects, as long as they
support ``hash()``. (John Arbash Meinel)
+ * The bzrdir format registry now accepts an ``alias`` keyword to
+ register_metadir, used to indicate that a format name is an alias for
+ some other format and thus should not be reported when describing the
+ format. (Robert Collins)
+
API BREAKS:
TESTING:
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-01-02 22:30:46 +0000
+++ b/bzrlib/bzrdir.py 2008-01-06 19:41:29 +0000
@@ -2447,12 +2447,22 @@
e.g. BzrDirMeta1 with weave repository. Also, it's more user-oriented.
"""
+ def __init__(self):
+ """Create a BzrDirFormatRegistry."""
+ self._aliases = set()
+ super(BzrDirFormatRegistry, self).__init__()
+
+ def aliases(self):
+ """Return a set of the format names which are aliases."""
+ return frozenset(self._aliases)
+
def register_metadir(self, key,
repository_format, help, native=True, deprecated=False,
branch_format=None,
tree_format=None,
hidden=False,
- experimental=False):
+ experimental=False,
+ alias=False):
"""Register a metadir subformat.
These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
@@ -2491,10 +2501,10 @@
bd.repository_format = _load(repository_format)
return bd
self.register(key, helper, help, native, deprecated, hidden,
- experimental)
+ experimental, alias)
def register(self, key, factory, help, native=True, deprecated=False,
- hidden=False, experimental=False):
+ hidden=False, experimental=False, alias=False):
"""Register a BzrDirFormat factory.
The factory must be a callable that takes one parameter: the key.
@@ -2505,11 +2515,15 @@
"""
registry.Registry.register(self, key, factory, help,
BzrDirFormatInfo(native, deprecated, hidden, experimental))
+ if alias:
+ self._aliases.add(key)
def register_lazy(self, key, module_name, member_name, help, native=True,
- deprecated=False, hidden=False, experimental=False):
+ deprecated=False, hidden=False, experimental=False, alias=False):
registry.Registry.register_lazy(self, key, module_name, member_name,
help, BzrDirFormatInfo(native, deprecated, hidden, experimental))
+ if alias:
+ self._aliases.add(key)
def set_default(self, key):
"""Set the 'default' key to be a clone of the supplied key.
@@ -2518,6 +2532,7 @@
"""
registry.Registry.register(self, 'default', self.get(key),
self.get_help(key), info=self.get_info(key))
+ self._aliases.add('default')
def set_default_repository(self, key):
"""Set the FormatRegistry default and Repository default.
@@ -2670,6 +2685,7 @@
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
hidden=False,
)
+# The following two formats should always just be aliases.
format_registry.register_metadir('development',
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
help='Current development format. Can convert data to and from pack-0.92 '
@@ -2681,6 +2697,7 @@
branch_format='bzrlib.branch.BzrBranchFormat6',
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
experimental=True,
+ alias=True,
)
format_registry.register_metadir('development-subtree',
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0Subtree',
@@ -2693,7 +2710,9 @@
branch_format='bzrlib.branch.BzrBranchFormat6',
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
experimental=True,
+ alias=True,
)
+# And the development formats which the will have aliased one of follow:
format_registry.register_metadir('development0',
'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
help='Trivial rename of pack-0.92 to provide a development format. '
=== modified file 'bzrlib/info.py'
--- a/bzrlib/info.py 2007-11-06 09:00:25 +0000
+++ b/bzrlib/info.py 2008-01-06 20:01:30 +0000
@@ -440,7 +440,9 @@
tree.bzrdir.root_transport.base):
branch = None
repository = None
- for key in bzrdir.format_registry.keys():
+ non_aliases = set(bzrdir.format_registry.keys())
+ non_aliases.difference_update(bzrdir.format_registry.aliases())
+ for key in non_aliases:
format = bzrdir.format_registry.make_bzrdir(key)
if isinstance(format, bzrdir.BzrDirMetaFormat1):
if (tree and format.workingtree_format !=
@@ -457,11 +459,12 @@
candidates.append(key)
if len(candidates) == 0:
return 'unnamed'
- new_candidates = [c for c in candidates if c != 'default']
- if len(new_candidates) > 0:
- candidates = new_candidates
+ candidates.sort()
new_candidates = [c for c in candidates if not
bzrdir.format_registry.get_info(c).hidden]
if len(new_candidates) > 0:
+ # If there are any non-hidden formats that match, only return those to
+ # avoid listing hidden formats except when only a hidden format will
+ # do.
candidates = new_candidates
return ' or '.join(candidates)
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- a/bzrlib/tests/test_bzrdir.py 2007-12-21 20:32:22 +0000
+++ b/bzrlib/tests/test_bzrdir.py 2008-01-06 19:45:00 +0000
@@ -170,6 +170,16 @@
finally:
bzrdir.format_registry.set_default_repository(old_default)
+ def test_aliases(self):
+ a_registry = bzrdir.BzrDirFormatRegistry()
+ a_registry.register('weave', bzrdir.BzrDirFormat6,
+ 'Pre-0.8 format. Slower and does not support checkouts or shared'
+ ' repositories', deprecated=True)
+ a_registry.register('weavealias', bzrdir.BzrDirFormat6,
+ 'Pre-0.8 format. Slower and does not support checkouts or shared'
+ ' repositories', deprecated=True, alias=True)
+ self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
+
class SampleBranch(bzrlib.branch.Branch):
"""A dummy branch for guess what, dummy use."""
=== modified file 'bzrlib/tests/test_info.py'
--- a/bzrlib/tests/test_info.py 2007-11-26 13:55:51 +0000
+++ b/bzrlib/tests/test_info.py 2008-01-06 20:02:10 +0000
@@ -126,16 +126,22 @@
def test_describe_tree_format(self):
for key in bzrdir.format_registry.keys():
- if key == 'default':
+ if key in bzrdir.format_registry.aliases():
continue
self.assertTreeDescription(key)
def test_describe_checkout_format(self):
for key in bzrdir.format_registry.keys():
- if key in ('default', 'weave', 'experimental'):
- continue
- if key.startswith('experimental-'):
- # these are typically hidden or aliases for other formats
+ if key in bzrdir.format_registry.aliases():
+ # Aliases will not describe correctly in the UI because the
+ # real format is found.
+ continue
+ # legacy: weave does not support checkouts
+ if key == 'weave':
+ continue
+ if bzrdir.format_registry.get_info(key).experimental:
+ # We don't require that experimental formats support checkouts
+ # or describe correctly in the UI.
continue
expected = None
if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
@@ -149,7 +155,7 @@
def test_describe_branch_format(self):
for key in bzrdir.format_registry.keys():
- if key == 'default':
+ if key in bzrdir.format_registry.aliases():
continue
expected = None
if key in ('dirstate', 'knit'):
@@ -158,7 +164,7 @@
def test_describe_repo_format(self):
for key in bzrdir.format_registry.keys():
- if key == 'default':
+ if key in bzrdir.format_registry.aliases():
continue
expected = None
if key in ('dirstate', 'knit', 'dirstate-tags'):
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
2598.5.7 | 18 years ago | Aaron Bentley | Updates from review | 5.9 KB |
|
|
|
test_add.py |
2323.3.3 | 18 years ago | Robert Collins | Merge Martins 0.15rc2 release branch. | 6.6 KB |
|
|
|
test_add_reference.py |
2255.2.228 | 18 years ago | Robert Collins | Make all test_add_reference tests pass again. | 4.5 KB |
|
|
|
test_basis_inventory.py |
2255.6.1 | 18 years ago | Aaron Bentley | Merge from by-reference-trees | 3.1 KB |
|
|
|
test_basis_tree.py |
2255.2.72 | 18 years ago | John Arbash Meinel | Add some tests for WorkingTree.basis_tree() | 2.9 KB |
|
|
|
test_break_lock.py |
3015.2.11 | 18 years ago | Robert Collins | Handle repositories that do not physically lock in | 3.1 KB |
|
|
|
test_changes_from.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 2.2 KB |
|
|
|
test_commit.py |
2982 | 18 years ago | Canonical.com Patch Queue Manager | (John Arbash Meinel) Consolidate all calls to get | 21.7 KB |
|
|
|
test_executable.py |
2911.5.4 | 18 years ago | John Arbash Meinel | Switch around to properly look up the executable b | 7.3 KB |
|
|
|
test_flush.py |
2052.3.10 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2079 | 2.6 KB |
|
|
|
test_get_file_mtime.py |
2405.3.2 | 18 years ago | John Arbash Meinel | Fix one test. | 3.3 KB |
|
|
|
test_get_parent_ids.py |
2249.5.7 | 18 years ago | John Arbash Meinel | Make sure WorkingTree revision_ids are also return | 2.5 KB |
|
|
|
test_inv.py |
2879 | 18 years ago | Canonical.com Patch Queue Manager | (robertc) Move serialisation of inventory entries | 6.1 KB |
|
|
|
test_is_control_filename.py |
1773.4.1 | 19 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 1.7 KB |
|
|
|
test_is_ignored.py |
2696.1.1 | 18 years ago | Martin Pool | Remove things deprecated in 0.11 and earlier | 8.4 KB |
|
|
|
test_locking.py |
1986.5.7 | 19 years ago | Robert Collins | Merge reviews. | 11.8 KB |
|
|
|
test_merge_from_branch.py |
1551.15.69 | 18 years ago | Aaron Bentley | Add merge_type to merge_from_branch | 4.8 KB |
|
|
|
test_mkdir.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 1.3 KB |
|
|
|
test_move.py |
2456.2.1 | 18 years ago | John Arbash Meinel | (broken) Add a (failing) test that _iter_changes w | 23.1 KB |
|
|
|
test_nested_specifics.py |
1551.10.26 | 18 years ago | Aaron Bentley | Allow extract when tree is locked | 1.9 KB |
|
|
|
test_parents.py |
2929.2.2 | 18 years ago | Robert Collins | Review feedback on dirstate update_basis_via_delta | 27.7 KB |
|
|
|
test_paths2ids.py |
2255.2.104 | 18 years ago | Robert Collins | Add WorkingTree4.paths2ids which is inventory-usag | 7.7 KB |
|
|
|
test_pull.py |
2949.5.1 | 18 years ago | Alexander Belchenko | selftest: use SymlinkFeature instead of TestSkippe | 2.2 KB |
|
|
|
test_put_file.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 1.5 KB |
|
|
|
test_read_working_inventory.py |
2255.2.45 | 18 years ago | Robert Collins | Dirstate - fix revision_tree() behaviour to match | 1.8 KB |
|
|
|
test_readonly.py |
2255.10.1 | 18 years ago | John Arbash Meinel | Update WorkingTree4 so that it doesn't use a HashC | 4.3 KB |
|
|
|
test_remove.py |
3051 | 18 years ago | Canonical.com Patch Queue Manager | (Lukáš Lalinský) Fix bug #172598 by cleaning up th | 11.9 KB |
|
|
|
test_rename_one.py |
2825.6.1 | 18 years ago | Robert Collins | * ``WorkingTree.rename_one`` will now raise an err | 13.1 KB |
|
|
|
test_revision_tree.py |
2255.2.76 | 18 years ago | Robert Collins | Add tests for revision trees with a different uniq | 3.8 KB |
|
|
|
test_set_root_id.py |
2294.1.10 | 18 years ago | John Arbash Meinel | Switch all apis over to utf8 file ids. All tests p | 2.4 KB |
|
|
|
test_smart_add.py |
2585.1.1 | 18 years ago | Aaron Bentley | Unify MutableTree.smart_add behavior by disabling | 10.2 KB |
|
|
|
test_uncommit.py |
2598.5.7 | 18 years ago | Aaron Bentley | Updates from review | 1.2 KB |
|
|
|
test_unversion.py |
2946.3.3 | 18 years ago | John Arbash Meinel | Prefer tree.get_root_id() as more explicit than tr | 7.5 KB |
|
|
|
test_walkdirs.py |
2979 | 18 years ago | Canonical.com Patch Queue Manager | (robertc) Fix WorkingTree.walkdirs to support walk | 9.6 KB |
|
|
|
test_workingtree.py |
3034.4.9 | 18 years ago | Alexander Belchenko | skip test_workingtree.TestWorkingTree.test_case_se | 36.2 KB |
|
|