Rev 3577: (mbp) rename stacked format to 1.6 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Jul 24 07:11:03 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3577
revision-id:pqm at pqm.ubuntu.com-20080724061047-yrvo5cmeik38kibz
parent: pqm at pqm.ubuntu.com-20080724054109-qqw7c0ecmk5a0ega
parent: mbp at sourcefrog.net-20080724051940-h9reurya2k9v2gqt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-07-24 07:10:47 +0100
message:
(mbp) rename stacked format to 1.6
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3575.2.1
revision-id:mbp at sourcefrog.net-20080724051940-h9reurya2k9v2gqt
parent: pqm at pqm.ubuntu.com-20080723232923-z04bd6zco9cpa3zv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: stacking
timestamp: Thu 2008-07-24 15:19:40 +1000
message:
Rename stacked format to 1.6
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2008-07-23 22:07:42 +0000
+++ b/bzrlib/bzrdir.py 2008-07-24 05:19:40 +0000
@@ -2973,13 +2973,13 @@
branch_format='bzrlib.branch.BzrBranchFormat6',
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
)
-format_registry.register_metadir('stacked',
+format_registry.register_metadir('1.6',
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5',
help='A branch and pack based repository that supports stacking. ',
branch_format='bzrlib.branch.BzrBranchFormat7',
tree_format='bzrlib.workingtree.WorkingTreeFormat4',
)
-format_registry.register_metadir('stacked-rich-root',
+format_registry.register_metadir('1.6-rich-root',
'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack5RichRoot',
help='A branch and pack based repository that supports stacking '
'and rich root data (needed for bzr-svn). ',
=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- a/bzrlib/tests/blackbox/test_info.py 2008-07-24 05:05:20 +0000
+++ b/bzrlib/tests/blackbox/test_info.py 2008-07-24 06:10:47 +0000
@@ -247,8 +247,9 @@
branch5 = tree5.branch
out, err = self.run_bzr('info -v lightcheckout')
self.assertEqualDiff(
-"""Lightweight checkout (format: dirstate or dirstate-tags or \
-pack-0.92 or rich-root or rich-root-pack or stacked or stacked-rich-root)
+"""Lightweight checkout (format: 1.6 or 1.6-rich-root \
+or dirstate or dirstate-tags or \
+pack-0.92 or rich-root or rich-root-pack)
Location:
light checkout root: lightcheckout
checkout of branch: standalone
@@ -414,8 +415,9 @@
# Out of date lightweight checkout
out, err = self.run_bzr('info lightcheckout --verbose')
self.assertEqualDiff(
-"""Lightweight checkout (format: dirstate or dirstate-tags or \
-pack-0.92 or rich-root or rich-root-pack or stacked or stacked-rich-root)
+"""Lightweight checkout (format: 1.6 or 1.6-rich-root or \
+dirstate or dirstate-tags or \
+pack-0.92 or rich-root or rich-root-pack)
Location:
light checkout root: lightcheckout
checkout of branch: standalone
@@ -550,8 +552,9 @@
datestring_first = format_date(rev.timestamp, rev.timezone)
out, err = self.run_bzr('info tree/lightcheckout --verbose')
self.assertEqualDiff(
-"""Lightweight checkout (format: dirstate or dirstate-tags or \
-pack-0.92 or rich-root or rich-root-pack or stacked or stacked-rich-root)
+"""Lightweight checkout (format: 1.6 or 1.6-rich-root or \
+dirstate or dirstate-tags or \
+pack-0.92 or rich-root or rich-root-pack)
Location:
light checkout root: tree/lightcheckout
checkout of branch: repo/branch
@@ -673,8 +676,9 @@
datestring_last = format_date(rev.timestamp, rev.timezone)
out, err = self.run_bzr('info tree/lightcheckout --verbose')
self.assertEqualDiff(
-"""Lightweight checkout (format: dirstate or dirstate-tags or \
-pack-0.92 or rich-root or rich-root-pack or stacked or stacked-rich-root)
+"""Lightweight checkout (format: 1.6 or 1.6-rich-root or \
+dirstate or dirstate-tags or \
+pack-0.92 or rich-root or rich-root-pack)
Location:
light checkout root: tree/lightcheckout
checkout of branch: repo/branch
@@ -1088,9 +1092,9 @@
(False, True): 'Lightweight checkout',
(False, False): 'Checkout',
}[(shared_repo is not None, light_checkout)]
- format = {True: 'dirstate or dirstate-tags or pack-0.92'
- ' or rich-root or rich-root-pack'
- ' or stacked or stacked-rich-root',
+ format = {True: '1.6 or 1.6-rich-root'
+ ' or dirstate or dirstate-tags or pack-0.92'
+ ' or rich-root or rich-root-pack',
False: 'dirstate'}[light_checkout]
if repo_locked:
repo_locked = lco_tree.branch.repository.get_physical_lock_status()
=== modified file 'bzrlib/tests/test_info.py'
--- a/bzrlib/tests/test_info.py 2008-07-22 09:05:52 +0000
+++ b/bzrlib/tests/test_info.py 2008-07-24 05:19:40 +0000
@@ -146,9 +146,10 @@
expected = None
if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
'pack-0.92', 'pack-0.92-subtree', 'rich-root',
- 'rich-root-pack', 'stacked', 'stacked-rich-root'):
- expected = 'dirstate or dirstate-tags or pack-0.92 or'\
- ' rich-root or rich-root-pack or stacked or stacked-rich-root'
+ 'rich-root-pack', '1.6', '1.6-rich-root'):
+ expected = '1.6 or 1.6-rich-root or ' \
+ 'dirstate or dirstate-tags or pack-0.92 or'\
+ ' rich-root or rich-root-pack'
if key in ('knit', 'metaweave'):
expected = 'knit or metaweave'
self.assertCheckoutDescription(key, expected)
More information about the bazaar-commits
mailing list