Changeset 452 in tailor

Timestamp:

07/30/05 02:55:40 (8 years ago)

Author:

lele@…

Hash name:

20050730005540-97f81-edbbc8a775d04189061a4ecb509351c9d2f915ae

Message:

Added the infrastructure to allow easier bootstraps

Location:

vcpx

Files:

• target.py (modified) (1 diff)
• dualwd.py (modified) (1 diff)
• tailor.py (modified) (5 diffs)

vcpx/target.py

@@ -316 +316 @@
         raise "%s should override this method" % self.__class__
 
+    def prepareWorkingDirectory(self, root, target_repository, target_module):
+        """
+        Do anything required to setup the hosting working directory.
+        """
+
+        self._prepareTargetRepository(root, target_repository, target_module)
+        self._prepareWorkingDirectory(root, target_repository, target_module)
+
+    def _prepareTargetRepository(self, root, target_repository, target_module):
+        """
+        Possibly create the repository, when overriden by subclasses.
+        """
+
+    def _prepareWorkingDirectory(self, root, target_repository, target_module):
+        """
+        Possibly checkout a working copy of the target VC, that will host the
+        upstream source tree, when overriden by subclasses.
+        """
+
     def initializeNewWorkingDir(self, root, source_repository,
                                 source_module, subdir, changeset, initial):

vcpx/dualwd.py

@@ -60 +60 @@
         # SyncronizableTargetWorkingDir
 
+        self.prepareWorkingDirectory = self.target.prepareWorkingDirectory
         self.initializeNewWorkingDir = self.target.initializeNewWorkingDir
         self.commitDelayedChangesets = self.target.commitDelayedChangesets

vcpx/tailor.py

@@ -114 +114 @@
                                        self.options.source_module,
                                        self.options.revision,
+                                       self.options.target_repository,
+                                       self.options.target_module,
                                        self.options.subdir)
                 elif self.options.migrate:
@@ -289 +291 @@
 
     def bootstrap(self, source_kind, target_kind,
-                  source_repository, source_module, revision, subdir):
+                  source_repository, source_module, revision,
+                  target_repository, target_module, subdir):
         """
         Bootstrap a new tailorized module.
+
+        First of all prepare the target system working directory such that
+        it can host the upstream source tree. This is backend specific.
 
         Extract a copy of the ``repository`` at given ``revision`` in the
@@ -320 +326 @@
         self.logger.info("getting %s revision '%s' of '%s' from '%s'" % (
             source_kind, revision, source_module, source_repository))
+
+        try:
+            dwd.prepareWorkingDirectory(self.root,
+                                        target_repository, target_module)
+        except:
+            self.logger.exception('Cannot prepare working directory!')
+            raise
 
         try:
@@ -543 +556 @@
                      "backends.",
                 default="HEAD"),
+    make_option("-T", "--target-repository",
+                dest="target_repository", metavar="REPOS", default=None,
+                help="Specify the target repository, the one that will "
+                     "receive the patches coming from the source one."),
+    make_option("-M", "--target-module", dest="target_module",
+                metavar="MODULE",
+                help="Specify the module on the target repository that will "
+                     "actually contain the upstream source tree."),
     make_option("--subdir", metavar="DIR",
                 help="Force the subdirectory where the checkout will happen, "
@@ -663 +684 @@
                                    options.source_module,
                                    options.revision,
+                                   options.target_repository,
+                                   options.target_module,
                                    options.subdir)
             elif options.update: