Rev 1614: Revert default format back to rich-root-pack. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Sat Aug 23 11:15:49 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1614
revision-id: jelmer at samba.org-20080823101540-0od362oanzhzdved
parent: jelmer at samba.org-20080823023945-bcsfdso94y72fvt0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-23 12:15:40 +0200
message:
  Revert default format back to rich-root-pack.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
  remote.py                      format.py-20060406233823-b6fa009fe35dfde7
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
=== modified file 'NEWS'
--- a/NEWS	2008-08-22 16:22:40 +0000
+++ b/NEWS	2008-08-23 10:15:40 +0000
@@ -4,8 +4,6 @@
 
    * Fix setup.py run with python2.4. (#256804)
 
-   * Change default format to 1.6-rich-root.
-
    * Use rst2html.py rather than rst2html if it is available.
 
   BUG FIXES

=== modified file 'format.py'
--- a/format.py	2008-08-21 17:46:18 +0000
+++ b/format.py	2008-08-23 10:15:40 +0000
@@ -35,7 +35,7 @@
         return format
     # Default format does not support rich root data, 
     # fall back to 1.6-rich-root
-    format = format_registry.make_bzrdir('1.6-rich-root')
+    format = format_registry.make_bzrdir('rich-root-pack')
     assert format.repository_format.rich_root_data
     return format
 

=== modified file 'remote.py'
--- a/remote.py	2008-08-21 17:46:18 +0000
+++ b/remote.py	2008-08-23 10:15:40 +0000
@@ -89,7 +89,7 @@
 
     def cloning_metadir(self):
         """Produce a metadir suitable for cloning with."""
-        return bzrlib.bzrdir.format_registry.make_bzrdir("1.6-rich-root")
+        return bzrlib.bzrdir.format_registry.make_bzrdir("rich-root-pack")
 
     def open_workingtree(self, _unsupported=False,
             recommend_upgrade=True):

=== modified file 'repository.py'
--- a/repository.py	2008-08-23 02:39:45 +0000
+++ b/repository.py	2008-08-23 10:15:40 +0000
@@ -910,7 +910,7 @@
                                project=None, check_removed=False, 
                                find_branches=True, find_tags=True):
         if not check_removed and from_revnum == 0:
-            it = iter()
+            it = iter([])
             if find_branches:
                 it = chain(it, layout.get_branches(to_revnum, project))
             if find_tags:




More information about the bazaar-commits mailing list