Changeset 475

Timestamp:

05/21/08 09:59:49 (8 months ago)

Author:

jmowery

Message:

update to storage after some initial testing
all storage specific functions other than export and locking tested

Files:

• branches/trunk-pmd-intproto/server/storage.py (modified) (5 diffs)

branches/trunk-pmd-intproto/server/storage.py

@@ -343 +343 @@
-                now = int(time.time())
-                layer_latest = 0
+                for d in self.list_controlled_dirs(): #consider initial time for controlled dirs for latest
+                        if self.entries[d].initial > layer_latest:
+                                layer_latest = self.entries[d].initial
-                for name in self.list_controlled_files(): #update all latest fields
-                        file_latest = self.storage.find_recent(name, now)
@@ -487 +490 @@
-                        _l.checkin()
-                        _l.update()
+                self.update()
-
-        #functions to add and remove files and directories
@@ -592 +596 @@
-                self.storage = StorageData()
-                self.storage.path = self.name
-                self.storage.root = find_control_root(self.storage.path)
-                self.name = self.name[len(os.path.dirname(self.storage.root)) + 1:] #shorten name removing directories above root
-                self.storage.storage_dir = os.path.join(self.storage.path, '.__storage__')
-                os.mkdir(self.storage.storage_dir)
-                self.storage.nodes_dir = os.path.join(self.storage.path, '.__nodes__')
-                os.mkdir(self.storage.nodes_dir)
-                self.storage.logs_dir = os.path.join(self.storage.root, '.__logs__')
-                if not os.path.exists(self.storage.logs_dir):
-                        os.mkdir(self.storage.logs_dir)
-                self.storage.status_path = os.path.join(self.storage.path, '.__status__')
-                if not self.storage.config.has_section('general'):
@@ -610 +609 @@
-                self.entries['.'] = self.storage.add_dir('.')
-                self.storage.write()
+                self.storage.root = find_control_root(self.storage.path)
+                self.storage.logs_dir = os.path.join(self.storage.root, '.__logs__')
+                if not os.path.exists(self.storage.logs_dir):
+                        os.mkdir(self.storage.logs_dir)
+                self.name = self.name[len(os.path.dirname(self.storage.root)) + 1:] #shorten name removing directories above root
+                self.modified = True
-                if is_controlled(os.path.join(self.storage.path, '..')):
-                        _l = Layer(os.path.join(self.storage.path, '..'))
-                        _l.add(os.path.basename(self.storage.path))
-                        _l.update()
+                self.update()
-
-        def clean(self, names, recursive=False):
@@ -747 +753 @@
-                                                continue
-                                        stats.append(self.status_prefix(entry) + entry + self.version_suffix(entry))
+                                for d in self.list_controlled_dirs():
+                                        _l = Layer(os.path.join(self.storage.path, d))
+                                        stats += _l.status('.', recursive)
+                                        _l.update()
-                        return stats
-                e = self.get_entry(names)