Changeset 461

Timestamp:

05/15/08 16:15:24 (8 months ago)

Author:

jmowery

Message:

refactoring storage incremental check-in

Files:

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

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

@@ -188 +188 @@
-                self.logs_dir = os.path.join(self.root, '.__logs__') #logs are only kept at the root of the store
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        def remove_file(self, name):
@@ -196 +206 @@
-                raise NotImplementedError
-
-
+, local=False
-                '''Add a directory to the store. This function is not recursive.'''
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        def remove_dir(self, name):
@@ -239 +261 @@
-        '''The Layer object maintains all data relevant to a single hierarchical group.'''
-        modified = False # set to True if the data in any field has changed since last sync to disk
- 
+
-        description = '' # User configurable description of the type of files contained in the Layer
-        entries = {}     # Dictionary of file name, Entry pairs per controlled file
@@ -253 +275 @@
-                        for entry in self.storage.config.get_options('entries'):
-                                self.entries[entry] = pickle.loads(self.storage.config.get('entries', entry))
+                        self.description = self.storage.config.get('general', 'description')
-                        self.name = self.name[len(os.path.dirname(self.storage.root)) + 1:] #shorten name removing directories above root
-
@@ -282 +305 @@
-        def export(self, dest_path):
-                '''Create a recursive copy of this Layer and the applied version of all its controlled files and subdirectories at dest_path without any revision control files.'''
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        def get_current(self, name):
@@ -295 +333 @@
-                        return ''
-                cur = self.storage.find_recent(name, self.entries['.'].applied)
+                if cur == 0:
+                        return ''
-                return os.path.join(self.storage.storage_dir, name) + '.' + str(cur)
-
@@ -319 +359 @@
-                        return True #deletion is a modification
-                statinfo = os.stat(path)
-    
+
-                        return True
-                return False
@@ -325 +365 @@
-        def checkin(self):
-                '''Recursively add new versions for all modified files.'''
-
+
+
+
+
+
+
+
+
+
-
-        #functions to add and remove files and directories
@@ -358 +406 @@
-                        if e.lock:
-                                raise RuntimeError, 'File \'' + name + '\' is locked; cannot add new version.'
-
-
+
+
+
+
+
+
+
-                else: #no entry yet; create one
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-        def remove(self, names):
@@ -370 +433 @@
-        def control(self):
-                '''Place the layer under revision control; if already controlled, do nothing.'''
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        def clean(self, names, recursive=False):
@@ -446 +532 @@
-                return ' ' + applied_stamp + latest_stamp
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        def list_controlled_files(self):
-                '''Return a list of all files under revision control in this Layer.'''
-
+
+
+
+
+
-
-        def list_controlled_dirs(self):
-                '''Return a list of all controlled subdirectories under this Layer.'''
-
+
+
+
+
+
-
-        def list_controlled(self):
@@ -466 +634 @@
-                return self.list_controlled_files() + self.list_controlled_dirs()
-
-        def group_name(self):
-                '''Return the group name this Layer represents; this is the name used by Nodes for classification.'''
-                raise NotImplementedError
-
-        #locking functions
-        def lock(self, names=['.'], recursive=False):
@@ -481 +645 @@
-        def is_locked(self, name='.', recursive=False): #add recursive as option)
-                '''Return True if name was locked by a prior call to lock(); if recursive, return True if any file under name is locked.'''
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        #node handling functions
@@ -505 +696 @@
-        def append_log_messages(self, id, messages):
-                '''Append log messages to the stored log cache for node id.'''
-
+
+
+
+
+
+
+
+
+
-
-        def get_log_messages(self, id):
-                '''Retrieve all log messages stored for node id.'''
-
+
+
+
+
+
+
+
+
-
-        #TODO should there be a clear log?