Rev 2485: Update tree format signatures to mention introducing bzr version. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2485
revision-id: robertc at robertcollins.net-20070306134733-gx8sio7eqnhfi3zn
parent: robertc at robertcollins.net-20070306132101-cj5e3d7d6834f80o
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 00:47:33 +1100
message:
  Update tree format signatures to mention introducing bzr version.
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'BRANCH.TODO'
--- a/BRANCH.TODO	2007-03-06 10:29:01 +0000
+++ b/BRANCH.TODO	2007-03-06 13:47:33 +0000
@@ -14,8 +14,6 @@
 
 _iter_changes needs to stop iterating into control directories
 
-Set the introduction version of WorkingTreeFormat4 in workingtree.py.
-
 set_parent_trees needing to do the weird hack of making empty trees to pass in.
 
 deprecate Tree.__iter__.

=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2007-03-06 12:28:18 +0000
+++ b/bzrlib/branch.py	2007-03-06 13:47:33 +0000
@@ -65,7 +65,7 @@
 
 BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
 BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
-BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
+BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
 
 
 # TODO: Maybe include checks for common corruption of newlines, etc?
@@ -1024,7 +1024,7 @@
 
     def get_format_string(self):
         """See BranchFormat.get_format_string()."""
-        return "Bazaar-NG branch format 6\n"
+        return "Bazaar Branch Format 6 (bzr 0.15)\n"
 
     def get_format_description(self):
         """See BranchFormat.get_format_description()."""

=== modified file 'bzrlib/repofmt/knitrepo.py'
--- a/bzrlib/repofmt/knitrepo.py	2007-03-06 06:35:00 +0000
+++ b/bzrlib/repofmt/knitrepo.py	2007-03-06 13:47:33 +0000
@@ -428,7 +428,7 @@
             
     def get_format_string(self):
         """See RepositoryFormat.get_format_string()."""
-        return "Bazaar Knit Repository Format 3\n"
+        return "Bazaar Knit Repository Format 3 (bzr 0.15)\n"
 
     def get_format_description(self):
         """See RepositoryFormat.get_format_description()."""

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2007-03-06 06:35:00 +0000
+++ b/bzrlib/repository.py	2007-03-06 13:47:33 +0000
@@ -1258,7 +1258,7 @@
 format_registry.default_key = 'Bazaar-NG Knit Repository Format 1'
 
 format_registry.register_lazy(
-    'Bazaar Knit Repository Format 3\n',
+    'Bazaar Knit Repository Format 3 (bzr 0.15)\n',
     'bzrlib.repofmt.knitrepo',
     'RepositoryFormatKnit3',
     )

=== modified file 'bzrlib/tests/test_workingtree_4.py'
--- a/bzrlib/tests/test_workingtree_4.py	2007-03-06 04:06:16 +0000
+++ b/bzrlib/tests/test_workingtree_4.py	2007-03-06 13:47:33 +0000
@@ -40,7 +40,7 @@
         # format 'Bazaar Working Tree format 4'
         # stat-cache = ??
         t = control.get_workingtree_transport(None)
-        self.assertEqualDiff('Bazaar Working Tree format 4\n',
+        self.assertEqualDiff('Bazaar Working Tree Format 4 (bzr 0.15)\n',
                              t.get('format').read())
         self.assertFalse(t.has('inventory.basis'))
         # no last-revision file means 'None' or 'NULLREVISION'

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-06 13:21:01 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-06 13:47:33 +0000
@@ -1163,7 +1163,7 @@
         - includes an explicit version marker for the workingtree control
           files, separate from the BzrDir format
         - modifies the hash cache format
-        - is new in bzr TODO FIXME SETBEFOREMERGE
+        - is new in bzr 0.15
         - uses a LockDir to guard access to it.
     """
 
@@ -1171,7 +1171,7 @@
 
     def get_format_string(self):
         """See WorkingTreeFormat.get_format_string()."""
-        return "Bazaar Working Tree format 4\n"
+        return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
 
     def get_format_description(self):
         """See WorkingTreeFormat.get_format_description()."""