Changeset 189 in tailor

Timestamp:

12/27/04 22:06:16 (8 years ago)

Author:

lele@…

Hash name:

20041227210616-97f81-a214bf0dfa20faba590b8d4ae217adaf6b64018a

Message:

Tailorized projects do not need to be in a subdirectory anymore
Now, by specifying for example --subdir=., a tailorized project
can be extracted from the source and rewrapped into the target
system without adding a "spurious" subdirectory.

Location:

vcpx

Files:

• cvsps.py (modified) (1 diff)
• darcs.py (modified) (1 diff)
• svn.py (modified) (2 diffs)

vcpx/cvsps.py

@@ -292 +292 @@
             
         wdir = join(basedir, subdir)
-        if not exists(wdir):
+        if not exists(join(wdir, 'CVS')):
             c = CvsCheckout(working_dir=basedir)
             c(output=True,

vcpx/darcs.py

@@ -187 +187 @@
 
     def _checkoutUpstreamRevision(self, basedir, repository, module, revision,
-                                  logger=None):
+                                  subdir=None, logger=None):
         """
         Concretely do the checkout of the upstream revision.
         """
 
-        from os.path import join, exists
-        
-        wdir = join(basedir, module)
-
-        if not exists(wdir):
+        from os.path import join, exists, split
+        
+        if not subdir:
+            subdir = split(module)[1]
+            
+        wdir = join(basedir, subdir)
+        if not exists(join(wdir, '_darcs')):
             dget = SystemCommand(working_dir=basedir,
                                  command="darcs get --partial --verbose"
-                                         " %(tag)s '%(repository)s'")
+                                         " %(tag)s '%(repository)s' %(subdir)s")
             
             dget(output=True, repository=repository,
-                 tag=revision<>'HEAD' and '--tag=%s' % repr(revision) or '')
+                 tag=revision<>'HEAD' and '--tag=%s' % repr(revision) or '',
+                 subdir=subdir)
             if dget.exit_status:
                 raise TargetInitializationFailure(

vcpx/svn.py

@@ -282 +282 @@
         wdir = join(basedir, subdir)
 
-        if not exists(wdir):
+        if not exists(join(wdir, '.svn')):
+            if logger: logger.info("checking out a working copy")
             svnco = SvnCheckout(working_dir=basedir)
             svnco(output=True, repository=repository, module=module,
@@ -289 +290 @@
                 raise TargetInitializationFailure(
                     "'svn checkout' returned status %s" % svnco.exit_status)
+        else:
+            if logger: logger.info("%s already exists, assuming it's a svn working dir" % wdir)
 
         svninfo = SvnInfo(working_dir=wdir)