Rev 3469: (mbp) Update more users of default file modes from control_files to bzrdir in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3469
revision-id:pqm at pqm.ubuntu.com-20080604075316-2zq1pdapom9r80zr
parent: pqm at pqm.ubuntu.com-20080603072242-omtkkk586pc5k4d4
parent: mbp at sourcefrog.net-20080604072935-fan2dyggvc1hhkgt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-06-04 08:53:16 +0100
message:
  (mbp) Update more users of default file modes from control_files to bzrdir
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 3468.1.1
    revision-id:mbp at sourcefrog.net-20080604072935-fan2dyggvc1hhkgt
    parent: pqm at pqm.ubuntu.com-20080603072242-omtkkk586pc5k4d4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: filemodes
    timestamp: Wed 2008-06-04 17:29:35 +1000
    message:
      Update more users of default file modes from control_files to bzrdir
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'NEWS'
--- a/NEWS	2008-06-03 07:22:42 +0000
+++ b/NEWS	2008-06-04 07:29:35 +0000
@@ -367,7 +367,7 @@
     * The Python ``assert`` statement is no longer used in Bazaar source, and 
       a test checks this.  (Martin Pool)
 
-  API BREAKS:
+  API CHANGES:
 
     * ``bzrlib.status.show_pending_merges`` requires the repository to be
       locked by the caller. Callers should have been doing it anyway, but it

=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py	2008-06-02 22:27:34 +0000
+++ b/bzrlib/branch.py	2008-06-04 07:29:35 +0000
@@ -919,7 +919,7 @@
             for (filename, content) in utf8_files:
                 branch_transport.put_bytes(
                     filename, content,
-                    mode=control_files._file_mode)
+                    mode=a_bzrdir._get_file_mode())
         finally:
             control_files.unlock()
         return self.open(a_bzrdir, _found=True)
@@ -1413,7 +1413,7 @@
         It is intended to be called by BzrBranch5.set_revision_history."""
         self._transport.put_bytes(
             'revision-history', '\n'.join(history),
-            mode=self.control_files._file_mode)
+            mode=self.bzrdir._get_file_mode())
 
     @needs_write_lock
     def set_revision_history(self, rev_history):
@@ -1735,7 +1735,7 @@
             self._transport.delete('parent')
         else:
             self._transport.put_bytes('parent', url + '\n',
-                mode=self.control_files._file_mode)
+                mode=self.bzrdir._get_file_mode())
 
 
 class BzrBranch5(BzrBranch):
@@ -1914,7 +1914,7 @@
         revision_id = _mod_revision.ensure_null(revision_id)
         out_string = '%d %s\n' % (revno, revision_id)
         self._transport.put_bytes('last-revision', out_string,
-            mode=self.control_files._file_mode)
+            mode=self.bzrdir._get_file_mode())
 
     @needs_write_lock
     def set_last_revision_info(self, revno, revision_id):
@@ -2225,7 +2225,7 @@
         # Copying done; now update target format
         new_branch._transport.put_bytes('format',
             format.get_format_string(),
-            mode=new_branch.control_files._file_mode)
+            mode=new_branch.bzrdir._get_file_mode())
 
         # Clean up old files
         new_branch._transport.delete('revision-history')

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2008-05-29 20:17:37 +0000
+++ b/bzrlib/remote.py	2008-06-04 07:29:35 +0000
@@ -1258,12 +1258,12 @@
         self._lock_count = 0
         self._leave_lock = False
 
-    def _ensure_real_transport(self):
+    def _get_real_transport(self):
         # if we try vfs access, return the real branch's vfs transport
         self._ensure_real()
         return self._real_branch._transport
 
-    _transport = property(_ensure_real_transport)
+    _transport = property(_get_real_transport)
 
     def __str__(self):
         return "%s(%s)" % (self.__class__.__name__, self.base)

=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py	2008-05-29 12:27:24 +0000
+++ b/bzrlib/repository.py	2008-06-04 07:29:35 +0000
@@ -1975,7 +1975,7 @@
                 pass
         else:
             self._transport.put_bytes('no-working-trees', '',
-                mode=self.control_files._file_mode)
+                mode=self.bzrdir._get_file_mode())
     
     def make_working_trees(self):
         """Returns the policy for making working trees on new branches."""

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2008-05-12 04:07:49 +0000
+++ b/bzrlib/workingtree_4.py	2008-06-04 07:29:35 +0000
@@ -1309,7 +1309,7 @@
         control_files.create_lock()
         control_files.lock_write()
         transport.put_bytes('format', self.get_format_string(),
-            mode=control_files._file_mode)
+            mode=a_bzrdir._get_file_mode())
         if from_branch is not None:
             branch = from_branch
         else:
@@ -2537,4 +2537,4 @@
         """Change the format marker."""
         tree._transport.put_bytes('format',
             self.target_format.get_format_string(),
-            mode=tree._control_files._file_mode)
+            mode=tree.bzrdir._get_file_mode())