Changeset 527 in tailor for vcpx/repository.py

Timestamp:

08/09/05 01:36:47 (8 years ago)

Author:

lele@…

Hash name:

20050808233647-97f81-c2b161feb61fde0d387d466b1710dc661e822899

Message:

Big API change, reducing arguments in favour of instance attributes
This is a big and subtle change that brings nothing in term of
functionality but make it a lot easier maintaining and extending
tailor as a whole.

Basically, 'root' and 'subdir' arguments are gone replaced by a
self.basedir, computed from the configuration; instead of 'logger',
the code uses two new methods, log_info() and log_error() on most
objects. Other arguments are derived from the configuration objects
that hang around.

File:

• vcpx/repository.py (modified) (7 diffs)

vcpx/repository.py

@@ -35 +35 @@
         as ``source-repository`` (or ``target-repository``) in its [DEFAULT]
         section.
+
+        If the configuration does not specify a specific ``root-directory``
+        take the one from the project.
         """
 
@@ -45 +48 @@
         self.module = config.get(self.name, 'module') or \
                       config.get(self.name, '%s-module' % which)
-        if not self.module and self.repository:
-            self.module = split(self.repository)[1]
+        self.rootdir = config.get(self.name, 'root-directory',
+                                  self.project.rootdir)
+        self.subdir = config.get(self.name, 'subdir', self.project.subdir)
+
+    def _validateConfiguration(self):
+        """
+        Validate the configuration, possibly altering/completing it.
+        """
+
+    def log_info(self, what):
+        """
+        Print some info on the log and, in verbose mode, to stdout as well.
+        """
+
+        self.project.log_info(what)
+
+    def log_error(self, what, exc=False):
+        """
+        Print an error message, possibly with an exception traceback,
+        to the log and to stdout as well.
+        """
+
+        self.project.log_error(what, exc)
 
     def workingDir(self):
@@ -53 +77 @@
         repository.
         """
+
+        from source import InvocationError
+
+        self._validateConfiguration()
 
         wdname = self.kind.capitalize() + 'WorkingDir'
@@ -61 +89 @@
         except (AttributeError, ImportError):
             raise InvocationError("Unhandled source VCS kind: " + self.kind)
-        return workingdir()
+
+        return workingdir(self)
 
 
@@ -73 +102 @@
 
 
+
 class BzrRepository(Repository):
     METADIR = '.bzr'
@@ -99 +129 @@
         self.CVS_CMD = config.get(self.name, 'cvs-command', self.CVS_CMD)
 
+    def _validateConfiguration(self):
+        from os.path import split
+        from config import ConfigurationError
+
+
+        if not self.module and self.repository:
+            self.module = split(self.repository)[1]
+
+        if not self.module:
+            raise ConfigurationError("Must specify a repository and maybe a module also")
 
 class CvspsRepository(CvsRepository):
@@ -148 +188 @@
                                        'svnadmin-command', self.SVNADMIN_CMD)
         self.use_propset = config.get(self.name, 'use-propset', False)
+
+    def _validateConfiguration(self):
+        if not self.module:
+            raise ConfigurationError("Must the path within the "
+                                     "Subversion repository")
+
         if not self.module.startswith('/'):
+            self.project.log_info("Prepending '/' to module")
             self.module = '/' + self.module