Changeset 46 in tailor

Timestamp:

07/05/04 16:02:13 (9 years ago)

Author:

lele@…

Hash name:

20040705140213-97f81-a71dbf81825ae1ceec4042065e6d152d80c82bbf

Message:

Correct the initialization of a new working directory

Location:

vcpx

Files:

• cvs.py (modified) (1 diff)
• target.py (modified) (4 diffs)
• darcs.py (modified) (4 diffs)
• svn.py (modified) (3 diffs)
• dualwd.py (modified) (1 diff)
• tailor.py (modified) (1 diff)

vcpx/cvs.py

@@ -285 +285 @@
         
         c = CvsCommit(working_dir=root)
+
+        if entries:
+            entries = ' '.join(entries)
+        else:
+            entries = '.'
+            
         c(entries=entries, logfile=log.name)
         log.close()

vcpx/target.py

@@ -17 +17 @@
 HOST = socket.getfqdn()
 AUTHOR = "tailor"
+
+class TargetInitializationFailure(Exception):
+    pass
 
 class SyncronizableTargetWorkingDir(object):
@@ -95 +98 @@
         raise "%s should override this method" % self.__class__
 
-    def initializeNewWorkingDir(self, root, repository, revision):
+    def initializeNewWorkingDir(self, root, repository, module, revision):
         """
-        Initialize a new working directory, just extracted under
+        Initialize a new working directory, just extracted from
         some other VC system, importing everything's there.
         """
@@ -104 +107 @@
 
         now = datetime.now()
-        self._initializeWorkingDir(root)
+        self._initializeWorkingDir(root, module)
         self._commit(root, now, '%s@%s' % (AUTHOR, HOST),
-                     'Tailorization of %s@%s' % (repository, revision))
+                     'Tailorization of %s' % module,
+                     'Upstream sources from %s at revision %s' % (repository,
+                                                                  revision),
+                     entries=[module])
 
-    def _initializeWorkingDir(self, root, addentry=None):
+    def _initializeWorkingDir(self, root, module, addentry=None):
         """
-        Assuming the `root` directory is a working copy extracted
-        from some VC repository, add it and all its content to the
-        target repository.
+        Assuming the `root` directory contains a working copy `module`
+        extracted from some VC repository, add it and all its content
+        to the target repository.
 
         This implementation first runs the given `addentry`
@@ -126 +132 @@
         assert addentry, "Subclass should have specified something as addentry"
         
-        from os.path import split
+        from os.path import split, join
         from os import walk
 
-        basedir,wdir = split(root)
-        c = addentry(working_dir=basedir)
-        c(entry=repr(wdir))
+        c = addentry(working_dir=root)
+        c(entry=repr(module))
 
-        for dir, subdirs, files in walk(root):
+        for dir, subdirs, files in walk(join(root, module)):
             for excd in ['.svn', '_darcs', 'CVS']:
                 if excd in subdirs:

vcpx/darcs.py

@@ -22 +22 @@
 
 class DarcsRecord(SystemCommand):
-    COMMAND = "darcs record --all --look-for-adds --pipe"
+    COMMAND = "darcs record --all --look-for-adds --pipe %(entries)s"
 
     def __call__(self, output=None, dry_run=False, **kwargs):
@@ -210 +210 @@
 
         c = DarcsRecord(working_dir=root)
+
+        if entries:
+            entries = ' '.join(entries)
+        else:
+            entries = '.'
+            
         c(output=True, date=date, patchname=remark,
-          logmessage=changelog, author=author)
+          logmessage=changelog, author=author, entries=entries)
         
     def _removeEntry(self, root, entry):
@@ -228 +234 @@
         c = DarcsMv(working_dir=root)
         c(old=oldentry, new=newentry)
-
-    def initializeNewWorkingDir(self, root, repository, revision):
-        """
-        Initialize the new repository and create a tag.
-        """
-        
-        SyncronizableTargetWorkingDir.initializeNewWorkingDir(self,
-                                                              root,
-                                                              repository,
-                                                              revision)
-        #self._createTag(root, 'Upstream revision %s' % revision)
 
     def _createTag(self, root, tagname):
@@ -270 +265 @@
             return tagname
 
-    def _initializeWorkingDir(self, root):
+    def _initializeWorkingDir(self, root, module):
         """
         Execute `darcs initialize`.

vcpx/svn.py

@@ -14 +14 @@
 from shwrap import SystemCommand
 from source import UpdatableSourceWorkingDir
-from target import SyncronizableTargetWorkingDir
+from target import SyncronizableTargetWorkingDir, TargetInitializationFailure
 
 
@@ -81 +81 @@
 
 class SvnCommit(SystemCommand):
-    COMMAND = "svn commit --file %(logfile)s %(entries)s"
+    COMMAND = "svn commit --quiet --file %(logfile)s %(entries)s"
 
     def __call__(self, output=None, dry_run=False, **kwargs):
@@ -282 +282 @@
         c(old=oldentry, new=newentry)
 
-    def _initializeWorkingDir(self, root, addentry=None):
+    def _initializeWorkingDir(self, root, module, addentry=None):
         """
         Add the given directory to an already existing svn working tree.
         """
-        
-        SyncronizableTargetWorkingDir._initializeWorkingDir(self, root, SvnAdd)
+
+        from os.path import exists, join
+
+        if not exists(join(root, '.svn')):
+            raise TargetInitializationFailure("'%s' should already be under SVN" % root)
+
+        SyncronizableTargetWorkingDir._initializeWorkingDir(self, root, module,
+                                                            SvnAdd)

vcpx/dualwd.py

@@ -52 +52 @@
     ## SyncronizableTargetWorkingDir
     
-    def initializeNewWorkingDir(self, root, repository, revision):
-        self.target.initializeNewWorkingDir(root, repository, revision)
+    def initializeNewWorkingDir(self, root, repository, module, revision):
+        self.target.initializeNewWorkingDir(root, repository, module, revision)

vcpx/tailor.py

@@ -101 +101 @@
                                               module, revision)
         self.logger.info("initializing %s shadow" % target_kind)
-        dwd.initializeNewWorkingDir(self.root, repository, actual)
+        dwd.initializeNewWorkingDir(self.root, repository, module, actual)
 
         self.source_kind = source_kind