Rev 3024: Rename knitpack-experimental format to pack-0.92 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Nov 26 08:03:43 GMT 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3024
revision-id:pqm at pqm.ubuntu.com-20071126080312-mc2sagjsq7u3lemo
parent: pqm at pqm.ubuntu.com-20071125173141-g89p6qnnh90tk5zi
parent: mbp at sourcefrog.net-20071126020538-ho1z20x9qrvk1b61
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-11-26 08:03:12 +0000
message:
  Rename knitpack-experimental format to pack-0.92
renamed:
  doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  doc/developers/packrepo.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
    ------------------------------------------------------------
    revno: 3010.3.3
    revision-id:mbp at sourcefrog.net-20071126020538-ho1z20x9qrvk1b61
    parent: mbp at sourcefrog.net-20071123053002-g625lweo6tzwbgqk
    parent: pqm at pqm.ubuntu.com-20071123053719-gxfu09uacv4heh6w
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: format-name
    timestamp: Mon 2007-11-26 13:05:38 +1100
    message:
      Merge trunk
    added:
      bzrlib/switch.py               switch.py-20071116011000-v5lnw7d2wkng9eux-1
      bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
      bzrlib/tests/repository_implementations/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
      bzrlib/tests/repository_implementations/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
      bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
      bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
      bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
      bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
      bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
      bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
      bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
      bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
      bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
      bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
      bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
      bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
      bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
      bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
      bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
      bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
      bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
    ------------------------------------------------------------
    revno: 3010.3.2
    revision-id:mbp at sourcefrog.net-20071123053002-g625lweo6tzwbgqk
    parent: mbp at sourcefrog.net-20071122075318-8wrf17dbth2qjzk5
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: format-name
    timestamp: Fri 2007-11-23 16:30:02 +1100
    message:
      Rename pack0.92 to pack-0.92
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
      doc/developers/packrepo.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
    ------------------------------------------------------------
    revno: 3010.3.1
    revision-id:mbp at sourcefrog.net-20071122075318-8wrf17dbth2qjzk5
    parent: pqm at pqm.ubuntu.com-20071121045727-gqycrul94d0ssir1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: format-name
    timestamp: Thu 2007-11-22 18:53:18 +1100
    message:
      Rename knitpack-experimental format to pack0.92 (not experimental)
    renamed:
      doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
      bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      doc/developers/packrepo.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
=== renamed file 'doc/developers/knitpack.txt' => 'doc/developers/packrepo.txt'
--- a/doc/developers/knitpack.txt	2007-10-31 19:07:26 +0000
+++ b/doc/developers/packrepo.txt	2007-11-23 05:30:02 +0000
@@ -42,12 +42,14 @@
 ``knitpack`` one. Here's how::
 
   cd my-stuff
-  bzr init --knitpack-experimental
+  bzr init --pack-0.92
   bzr add
   bzr commit -m "initial import"
 
 In other words, use the normal sequence of commands but add the
-``--knitpack-experimental`` option to the ``init`` command.
+``--pack-0.92`` option to the ``init`` command.
+
+**Note:** In bzr 0.92, this format was called ``knitpack-experimental``.
 
 Creating a new knitpack repository
 ----------------------------------
@@ -56,14 +58,14 @@
 for branches, you can make it a ``knitpack`` repository like this::
 
   cd my-repo
-  bzr init-repo --knitpack-experimental .
+  bzr init-repo --pack-0.92 .
   cd my-stuff
   bzr init
   bzr add
   bzr commit -m "initial import"
 
 In other words, use the normal sequence of commands but add the
-``--knitpack-experimental`` option to the ``init-repo`` command.
+``--pack-0.92`` option to the ``init-repo`` command.
 
 Upgrading an existing branch or repository to knitpack format
 -------------------------------------------------------------
@@ -71,11 +73,11 @@
 If you have an existing branch and wish to migrate it to
 a ``knitpack`` format, use the ``upgrade`` command like this::
 
-  bzr upgrade --knitpack-experimental path-to-my-branch
+  bzr upgrade --pack-0.92 path-to-my-branch
 
 If you are using a shared repository, run::
 
-  bzr upgrade --knitpack-experimental ROOT_OF_REPOSITORY
+  bzr upgrade --pack-0.92 ROOT_OF_REPOSITORY
 
 to upgrade the history database. Note that this will not
 alter the branch format of each branch, so
@@ -95,7 +97,7 @@
 
 Here are the commands for using the ``pull`` approach::
 
-    bzr init --knitpack-experimental my-new-branch
+    bzr init --pack-0.92 my-new-branch
     cd my-new-branch
     bzr pull my-source-branch
 
@@ -103,12 +105,12 @@
 
     bzr branch my-source-branch my-new-branch
     cd my-new-branch
-    bzr upgrade --knitpack-experimental .
+    bzr upgrade --pack-0.92 .
 
 Here are the commands for the shared repository approach::
 
   cd my-repo
-  bzr init-repo --knitpack-experimental .
+  bzr init-repo --pack-0.92 .
   bzr branch my-source-branch my-new-branch
   cd my-new-branch
 

=== modified file 'NEWS'
--- a/NEWS	2007-11-25 16:56:33 +0000
+++ b/NEWS	2007-11-26 08:03:12 +0000
@@ -15,6 +15,11 @@
      still available if user selects it explicitly with BZR_SSH environment
      variable. (Alexander Belchenko, workaround for bug #107593)
 
+   * The pack format is now accessible as "pack-0.92", or "pack-0.92-subtree" 
+     to enable the subtree functions (for example, for bzr-svn).  
+     See http://doc.bazaar-vcs.org/latest/developer/packrepo.html
+     (Martin Pool)
+
   FEATURES:
 
    * New ``authentication.conf`` file holding the password or other credentials
@@ -194,7 +199,7 @@
      the ``dirstate-tags`` format but uses a smarter storage design that greatly
      speeds up many operations, both local and remote. This new format can be
      used as an option to the ``init``, ``init-repository`` and ``upgrade``
-     commands. See http://doc.bazaar-vcs.org/latest/developers/knitpack.html
+     commands. See http://doc.bazaar-vcs.org/0.92/developers/knitpack.html
      for further details. (Robert Collins)
 
    * For users of bzr-svn (and those testing the prototype subtree support) that

=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2007-11-18 18:43:35 +0000
+++ b/bzrlib/bzrdir.py	2007-11-26 02:05:38 +0000
@@ -2504,24 +2504,26 @@
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
     hidden=True,
     )
-format_registry.register_metadir('knitpack-experimental',
+format_registry.register_metadir('pack-0.92',
     'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack1',
     help='New in 0.92: Pack-based format with data compatible with '
         'dirstate-tags format repositories. Interoperates with '
         'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
-        'NOTE: This format is experimental. Before using it, please read '
-        'http://doc.bazaar-vcs.org/latest/developers/knitpack.html.',
+        'Previously called knitpack-experimental.  '
+        'For more information, see '
+        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
     branch_format='bzrlib.branch.BzrBranchFormat6',
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
     experimental=True,
     )
-format_registry.register_metadir('knitpack-subtree-experimental',
+format_registry.register_metadir('pack-0.92-subtree',
     'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack3',
     help='New in 0.92: Pack-based format with data compatible with '
         'dirstate-with-subtree format repositories. Interoperates with '
         'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
-        'NOTE: This format is experimental. Before using it, please read '
-        'http://doc.bazaar-vcs.org/latest/developers/knitpack.html.',
+        'Previously called knitpack-experimental.  '
+        'For more information, see '
+        'http://doc.bazaar-vcs.org/latest/developers/packrepo.html.',
     branch_format='bzrlib.branch.BzrBranchFormat6',
     tree_format='bzrlib.workingtree.WorkingTreeFormat4',
     hidden=True,

=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2007-11-22 00:30:29 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2007-11-26 02:05:38 +0000
@@ -1811,7 +1811,7 @@
     _serializer = xml5.serializer_v5
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir('knitpack-experimental')
+        return bzrdir.format_registry.make_bzrdir('pack-0.92')
 
     def _ignore_setting_bzrdir(self, format):
         pass
@@ -1848,7 +1848,7 @@
 
     def _get_matching_bzrdir(self):
         return bzrdir.format_registry.make_bzrdir(
-            'knitpack-subtree-experimental')
+            'pack-0.92-subtree')
 
     def _ignore_setting_bzrdir(self, format):
         pass

=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- a/bzrlib/tests/blackbox/test_info.py	2007-11-22 21:20:30 +0000
+++ b/bzrlib/tests/blackbox/test_info.py	2007-11-26 02:05:38 +0000
@@ -264,8 +264,7 @@
         branch5 = tree5.branch
         out, err = self.run_bzr('info -v lightcheckout')
         self.assertEqualDiff(
-"""Lightweight checkout (format: dirstate or dirstate-tags or \
-knitpack-experimental or rich-root)
+"""Lightweight checkout (format: dirstate or dirstate-tags or pack-0.92 or rich-root)
 Location:
   light checkout root: lightcheckout
    checkout of branch: standalone
@@ -443,8 +442,7 @@
         # Out of date lightweight checkout
         out, err = self.run_bzr('info lightcheckout --verbose')
         self.assertEqualDiff(
-"""Lightweight checkout (format: dirstate or dirstate-tags or \
-knitpack-experimental or rich-root)
+"""Lightweight checkout (format: dirstate or dirstate-tags or pack-0.92 or rich-root)
 Location:
   light checkout root: lightcheckout
    checkout of branch: standalone
@@ -583,8 +581,7 @@
         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 \
-knitpack-experimental or rich-root)
+"""Lightweight checkout (format: dirstate or dirstate-tags or pack-0.92 or rich-root)
 Location:
   light checkout root: tree/lightcheckout
    checkout of branch: repo/branch
@@ -715,8 +712,7 @@
         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 \
-knitpack-experimental or rich-root)
+"""Lightweight checkout (format: dirstate or dirstate-tags or pack-0.92 or rich-root)
 Location:
   light checkout root: tree/lightcheckout
    checkout of branch: repo/branch
@@ -1159,8 +1155,7 @@
             (False, True): 'Lightweight checkout',
             (False, False): 'Checkout',
             }[(shared_repo is not None, light_checkout)]
-        format = {True: 'dirstate or dirstate-tags or knitpack-experimental'
-                        ' or rich-root',
+        format = {True: 'dirstate or dirstate-tags or pack-0.92 or rich-root',
                   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	2007-11-15 04:08:32 +0000
+++ b/bzrlib/tests/test_info.py	2007-11-26 02:05:38 +0000
@@ -139,10 +139,8 @@
                 continue
             expected = None
             if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
-                'knitpack-experimental', 'knitpack-subtree-experimental',
-                'rich-root'):
-                expected = 'dirstate or dirstate-tags or'\
-                    ' knitpack-experimental or rich-root'
+                'pack-0.92', 'pack-0.92-subtree', 'rich-root'):
+                expected = 'dirstate or dirstate-tags or pack-0.92 or rich-root'
             if key in ('knit', 'metaweave'):
                 expected = 'knit or metaweave'
             self.assertCheckoutDescription(key, expected)

=== modified file 'bzrlib/tests/test_repository.py'
--- a/bzrlib/tests/test_repository.py	2007-11-07 13:10:37 +0000
+++ b/bzrlib/tests/test_repository.py	2007-11-26 02:05:38 +0000
@@ -765,7 +765,7 @@
 class TestKnitPackNoSubtrees(TestCaseWithTransport):
 
     def get_format(self):
-        return bzrdir.format_registry.make_bzrdir('knitpack-experimental')
+        return bzrdir.format_registry.make_bzrdir('pack-0.92')
 
     def test_disk_layout(self):
         format = self.get_format()
@@ -1147,7 +1147,7 @@
 
     def get_format(self):
         return bzrdir.format_registry.make_bzrdir(
-            'knitpack-subtree-experimental')
+            'pack-0.92-subtree')
 
     def check_format(self, t):
         self.assertEqualDiff(
@@ -1158,7 +1158,7 @@
 class TestRepositoryPackCollection(TestCaseWithTransport):
 
     def get_format(self):
-        return bzrdir.format_registry.make_bzrdir('knitpack-experimental')
+        return bzrdir.format_registry.make_bzrdir('pack-0.92')
 
     def test__max_pack_count(self):
         """The maximum pack count is a function of the number of revisions."""




More information about the bazaar-commits mailing list