Rev 3053: Set default format to pack-0.92 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Fri Nov 30 01:26:22 GMT 2007


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

------------------------------------------------------------
revno: 3053
revision-id:pqm at pqm.ubuntu.com-20071130012617-w9ld4lj80b95vufk
parent: pqm at pqm.ubuntu.com-20071129184101-u9506rihe4zbzyyz
parent: mbp at sourcefrog.net-20071130003419-rogoz6xt0hrcy72c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-11-30 01:26:17 +0000
message:
  Set default format to pack-0.92
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
    ------------------------------------------------------------
    revno: 3044.1.4
    revision-id:mbp at sourcefrog.net-20071130003419-rogoz6xt0hrcy72c
    parent: mbp at sourcefrog.net-20071130003219-yvppir337j76p071
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 164476-default-format
    timestamp: Fri 2007-11-30 11:34:19 +1100
    message:
      Set default format to pack-0.92
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
    ------------------------------------------------------------
    revno: 3044.1.3
    revision-id:mbp at sourcefrog.net-20071130003219-yvppir337j76p071
    parent: mbp at sourcefrog.net-20071129075241-gt24frztc6mef2f3
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 164476-default-format
    timestamp: Fri 2007-11-30 11:32:19 +1100
    message:
      Set the default format to pack-0.92
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
    ------------------------------------------------------------
    revno: 3044.1.2
    revision-id:mbp at sourcefrog.net-20071129075241-gt24frztc6mef2f3
    parent: mbp at sourcefrog.net-20071129071242-1tcn2a18547udlvw
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 164476-default-format
    timestamp: Thu 2007-11-29 18:52:41 +1100
    message:
      Remove repository.format_registry default
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
=== modified file 'NEWS'
--- a/NEWS	2007-11-29 18:41:01 +0000
+++ b/NEWS	2007-11-30 01:26:17 +0000
@@ -9,6 +9,31 @@
 
   NOTES WHEN UPGRADING:
 
+   * The default repository format is now ``pack-0.92``.  This 
+     default is used when creating new repositories with ``init`` and 
+     ``init-repo``, and when branching over bzr+ssh or bzr+hpss. 
+     (See https://bugs.launchpad.net/bugs/164626)
+
+     This format can be read and written by Bazaar 0.92 and later, and 
+     data can be transferred to and from older formats.
+
+     To upgrade, please reconcile your repository (``bzr reconcile``), and then
+     upgrade (``bzr upgrade``). 
+     
+     ``pack-0.92`` offers substantially better scaling and performance than the
+     previous knits format. Some operations are slower where the code already
+     had bad scaling characteristics under knits, the pack format makes such
+     operations more visible as part of being more scalable overall. We will
+     correct such operations over the coming releases and encourage the filing
+     of bugs on any operation which you observe to be slower in a packs
+     repository. One particular case that we do not intend to fix is pulling
+     data from a pack repository into a knit repository over a high latency
+     link;  downgrading such data requires reinsertion of the file texts, and
+     this is a classic space/time tradeoff. The current implementation is
+     conservative on memory usage because we need to support converting data
+     from any tree without problems.  
+     (Robert Collins, Martin Pool, #164476)
+
   CHANGES:
 
    * Disable detection of plink.exe as possible ssh vendor. Plink vendor
@@ -205,6 +230,11 @@
    * ``bzrlib.repository.get_versioned_file_checker`` is now private.
      (Robert Collins)
 
+   * The Repository format registry default has been removed; it was previously
+     obsoleted by the bzrdir format default, which implies a default repository
+     format.
+     (Martin Pool)
+
   INTERNALS:
 
    * Added ``ContainerSerialiser`` and ``ContainerPushParser`` to

=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2007-11-29 18:41:01 +0000
+++ b/bzrlib/bzrdir.py	2007-11-30 01:26:17 +0000
@@ -2557,4 +2557,4 @@
     hidden=False,
     experimental=True,
     )
-format_registry.set_default('dirstate-tags')
+format_registry.set_default('pack-0.92')

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-11-28 01:35:49 +0000
+++ b/bzrlib/repository.py	2007-11-29 07:52:41 +0000
@@ -2149,14 +2149,11 @@
     'RepositoryFormat7'
     )
 
-# KEEP in sync with bzrdir.format_registry default, which controls the overall
-# default control directory format
 format_registry.register_lazy(
     'Bazaar-NG Knit Repository Format 1',
     'bzrlib.repofmt.knitrepo',
     'RepositoryFormatKnit1',
     )
-format_registry.default_key = 'Bazaar-NG Knit Repository Format 1'
 
 format_registry.register_lazy(
     'Bazaar Knit Repository Format 3 (bzr 0.15)\n',

=== modified file 'bzrlib/tests/test_switch.py'
--- a/bzrlib/tests/test_switch.py	2007-11-22 04:31:28 +0000
+++ b/bzrlib/tests/test_switch.py	2007-11-30 00:34:19 +0000
@@ -57,10 +57,12 @@
         tree.add('file-2')
         tree.remove('file-1')
         tree.commit('rev2')
+        self.build_tree(['checkout/file-3'])
+        checkout.add('file-3')
+        checkout_dir = checkout.bzrdir
+        # rename the branch on disk, the checkout object is now invalid.
         os.rename('branch-1', 'branch-2')
         to_branch = branch.Branch.open('branch-2')
-        self.build_tree(['checkout/file-3'])
-        checkout.add('file-3')
         switch.switch(checkout.bzrdir, to_branch)
         self.failIfExists('checkout/file-1')
         self.failUnlessExists('checkout/file-2')




More information about the bazaar-commits mailing list