Changeset 455 in tailor

Timestamp:

07/30/05 03:16:41 (8 years ago)

Author:

lele@…

Hash name:

20050730011641-97f81-ce33e46e7882dbc5dbe0af7a27576aa7e7758324

Message:

Target repository creation for Subversion
Using the new --target-repository and --target-module at bootstrap time
it's now easier to use a target SVN repository. If it's on the local
machine (it starts with  file:///) then when it does not exist tailor
creates it of kind fsfs.

Files:

• vcpx/svn.py (modified) (3 diffs)
• README (modified) (2 diffs)

vcpx/svn.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import ExternalCommand, PIPE, ReopenableNamedTemporaryFile
+from shwrap import ExternalCommand, PIPE, STDOUT, ReopenableNamedTemporaryFile
 from source import UpdatableSourceWorkingDir, \
      ChangesetApplicationFailure, GetUpstreamChangesetsFailure
@@ -18 +18 @@
 
 SVN_CMD = "svn"
+SVNADMIN_CMD = "svnadmin"
 
 def changesets_from_svnlog(log, url, repository, module):
@@ -389 +390 @@
             self._addPathnames(root, [newname])
 
+    def __createRepository(self, target_repository, target_module):
+        """
+        Create a local repository.
+        """
+
+        assert target_repository.startswith('file:///')
+
+        cmd = [SVNADMIN_CMD, "create", "--fs-type", "fsfs"]
+        svnadmin = ExternalCommand(command=cmd)
+        svnadmin.execute(target_repository[7:])
+
+        if svnadmin.exit_status:
+            raise TargetInitializationFailure("Was not able to create a 'fsfs' "
+                                              "svn repository at %r" %
+                                              target_repository)
+
+        if target_module and target_module <> '/':
+            cmd = [SVN_CMD, "mkdir", "-m",
+                   "This directory will host the upstream sources"]
+            svnmkdir = ExternalCommand(command=cmd)
+            svnmkdir.execute(target_repository + target_module)
+            if svnmkdir.exit_status:
+                raise TargetInitializationFailure("Was not able to create the "
+                                                  "module %r, maybe more than "
+                                                  "one level directory?" %
+                                                  target_module)
+
+    def _prepareTargetRepository(self, root, target_repository, target_module):
+        """
+        Check for target repository existence, eventually create it.
+        """
+
+        cmd = [SVN_CMD, "info"]
+        svninfo = ExternalCommand(command=cmd)
+        svninfo.execute(target_repository, stdout=PIPE, stderr=STDOUT)
+
+        if svninfo.exit_status:
+            if target_repository.startswith('file:///'):
+                self.__createRepository(target_repository, target_module)
+            else:
+                raise TargetInitializationFailure("%r does not exist and "
+                                                  "cannot be created since "
+                                                  "it's not a local (file:///) "
+                                                  "repository" %
+                                                  target_repository)
+
+    def _prepareWorkingDirectory(self, root, target_repository, target_module):
+        """
+        Checkout a working copy of the target SVN repository.
+        """
+
+        cmd = [SVN_CMD, "co", "--quiet"]
+        svnco = ExternalCommand(command=cmd)
+        svnco.execute(target_repository + target_module, root)
+
     def _initializeWorkingDir(self, root, source_repository, source_module,
                               subdir):

README

@@ -121 +121 @@
 __ http://svnbook.red-bean.com/en/1.0/ch05s02.html#svn-ch-5-sect-2.1
 __ http://svn.haxx.se/users/archive-2004-05/0245.shtml
-   
-   
+
 3. Showing each command bootstrap a new DARCS repos in
    "~/darcs/cmftopic" under which the upstream module will be
@@ -156 +155 @@
                 --module something new-darcs-repository
 
-
+8. Bootstrap a new SVN repository with tailor's master one. This
+   demonstrate the new --target-repository feature::
+
+    $ tailor -D -v -b -R http://nautilus.homeip.net/~lele/projects/tailor \
+            -s darcs -t svn --target-repository file:///tmp/svnrepo \
+            --target-module / /tmp/wc
+    $ svn info file:///tmp/svnrepo [Status 1]
+    $ svnadmin create --fs-type fsfs /tmp/svnrepo [Ok]
+    $ svn co --quiet file:///tmp/svnrepo/ /tmp/wc [Ok]
+    /tmp/wc $ darcs get --partial --verbose http://.../tailor tailor [Ok]
+    /tmp/wc/tailor $ darcs changes --last 1 --xml-output [Ok]
+    /tmp/wc $ svn add --quiet --no-auto-props --non-recursive tailor [Ok]
+    ...
+    
 Resolving conflicts
 ===================