← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-21 04:49:05 UTC
  • mfrom: (2367.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070321044905-ded01a80ab49bdd9
Update NEWS to match bzr 0.15.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
563
563
                # set our support for tree references from the repository in
564
564
                # use.
565
565
                self._repo_supports_tree_reference = getattr(
566
 
                    self.branch.repository._format, "supports_tree_reference",
 
566
                    self.branch.repository._format, "support_tree_reference",
567
567
                    False)
568
568
            except:
569
569
                self._control_files.unlock()
583
583
                # set our support for tree references from the repository in
584
584
                # use.
585
585
                self._repo_supports_tree_reference = getattr(
586
 
                    self.branch.repository._format, "supports_tree_reference",
 
586
                    self.branch.repository._format, "support_tree_reference",
587
587
                    False)
588
588
            except:
589
589
                self._control_files.unlock()
809
809
                                     size=cur_details[2],
810
810
                                     to_block=to_block,
811
811
                                     to_key=to_key,
812
 
                                     to_path_utf8=to_path_utf8)
 
812
                                     to_path_utf8=to_rel_utf8)
813
813
                            if minikind == 'd':
814
814
                                # We need to move all the children of this
815
815
                                # entry
1202
1202
            for file_id in file_ids:
1203
1203
                self._inventory.remove_recursive_id(file_id)
1204
1204
 
1205
 
    @needs_read_lock
1206
 
    def _validate(self):
1207
 
        self._dirstate._validate()
1208
 
 
1209
1205
    @needs_tree_write_lock
1210
1206
    def _write_inventory(self, inv):
1211
1207
        """Write inventory as the current inventory."""
1229
1225
        - uses a LockDir to guard access to it.
1230
1226
    """
1231
1227
 
1232
 
    upgrade_recommended = False
1233
 
 
1234
1228
    def get_format_string(self):
1235
1229
        """See WorkingTreeFormat.get_format_string()."""
1236
1230
        return "Bazaar Working Tree Format 4 (bzr 0.15)\n"
1262
1256
        # write out new dirstate (must exist when we create the tree)
1263
1257
        state = dirstate.DirState.initialize(local_path)
1264
1258
        state.unlock()
1265
 
        del state
1266
1259
        wt = WorkingTree4(a_bzrdir.root_transport.local_abspath('.'),
1267
1260
                         branch,
1268
1261
                         _format=self,
1270
1263
                         _control_files=control_files)
1271
1264
        wt._new_tree()
1272
1265
        wt.lock_tree_write()
1273
 
        wt.current_dirstate()._validate()
 
1266
        state._validate()
1274
1267
        try:
1275
1268
            if revision_id in (None, NULL_REVISION):
1276
1269
                wt._set_root_id(generate_ids.gen_root_id())
2365
2358
        # tree during upgrade.
2366
2359
        tree._control_files.lock_write()
2367
2360
        try:
2368
 
            tree.read_working_inventory()
2369
2361
            self.create_dirstate_data(tree)
2370
2362
            self.update_format(tree)
2371
2363
            self.remove_xml_files(tree)