Changeset 1391 in tailor

Timestamp:

06/15/07 17:05:00 (6 years ago)

Author:

henry.ne@…

Hash name:

20070615150500-e66d1-311dc867097c690062eada6b41c9e191818c1e72

Message:

svn-target-branches.patch
Subversion: Supports branches as target.

Add support for 'branches' on subversion targets. Modules, that starts
with 'branches/...' will be export under "branches".
Add 'svn-branches' to config, can change the path.

Hint: The 'trunk' is non special in tailor, simple set 'trunk' as module.

Full example from Monotone source to Subversion:

[DEFAULT]
start-revision = INITIAL
root-directory = /tmp/rootdir-Monotone
source-repository = $HOME/Monotone-database-file/monotone.mtn
target-repository =  file:///tmp/rootdir-Monotone/svn-repository-monotone
use-propset = True

# Projects
[net.venge.monotone.cvssync]
source = monotone:net.venge.monotone.cvssync
target = svn:net.venge.monotone.cvssync

[net.venge.monotone.de]
source = monotone:net.venge.monotone.de
target = svn:net.venge.monotone.de

[net.venge.monotone.svn_import]
source = monotone:net.venge.monotone.svn_import
target = svn:net.venge.monotone.svn_import

[net.venge.monotone]
source = monotone:net.venge.monotone
target = svn:net.venge.monotone

# Sources
[monotone:net.venge.monotone.cvssync]
module = net.venge.monotone.cvssync
subdir = mtnside-net.venge.monotone.cvssync

[monotone:net.venge.monotone.de]
module = net.venge.monotone.de
subdir = mtnside-net.venge.monotone.de

[monotone:net.venge.monotone.svn_import]
module = net.venge.monotone.svn_import
subdir = mtnside-net.venge.monotone.svn_import

[monotone:net.venge.monotone]
module = net.venge.monotone
subdir = mtnside-net.venge.monotone

# Targets
[svn:net.venge.monotone.cvssync]
module = branches/net.venge.monotone.cvssync
subdir = svnside-net.venge.monotone.cvssync

[svn:net.venge.monotone.de]
module = branches/net.venge.monotone.de
subdir = svnside-net.venge.monotone.de

[svn:net.venge.monotone.svn_import]
module = branches/net.venge.monotone.svn_import
subdir = svnside-net.venge.monotone.svn_import

[svn:net.venge.monotone]
module = trunk
subdir = svnside-net.venge.monotone

Files:

• vcpx/repository/svn.py (modified) (3 diffs)
• README (modified) (1 diff)

vcpx/repository/svn.py

@@ -41 +41 @@
         self.commit_all_files = cget(self.name, 'commit-all-files', True)
         self.tags_path = cget(self.name, 'svn-tags', '/tags')
+        self.branches_path = cget(self.name, 'svn-branches', '/branches')
         self._setupTagsDirectory = None
 
@@ -106 +107 @@
                            self.tags_path, self.name)
             self.tags_path = '/' + self.tags_path
+
+        if not self.branches_path.startswith('/'):
+            self.log.debug("Prepending '/' to svn-branches %r in %r",
+                           self.branches_path, self.name)
+            self.branches_path = '/' + self.branches_path
 
     def create(self):
@@ -163 +169 @@
             svnls.execute(self.repository + self.module)
             if svnls.exit_status:
+
+                paths = []
+
+                # Auto detect missing "branches/"
+                if self.module.startswith(self.branches_path + '/'):
+                    path = self.repository + self.branches_path
+                    cmd = self.command("ls")
+                    svnls = ExternalCommand(command=cmd)
+                    svnls.execute(path)
+                    if svnls.exit_status:
+                        paths.append(path)
+
+                paths.append(self.repository + self.module)
                 cmd = self.command("mkdir", "-m",
                                    "This directory will host the upstream sources")
                 svnmkdir = ExternalCommand(command=cmd)
-                svnmkdir.execute(self.repository + self.module)
+                svnmkdir.execute(paths)
                 if svnmkdir.exit_status:
                     raise TargetInitializationFailure("Was not able to create the "

README

@@ -919 +919 @@
   *tags* by default.
 
+svn-branches : string
+  Branches will copy under that directory.
+
+  *branches* by default.
+
+  .. note:: Target module for branches **must** start with ``branches/``.
+            Every branch must configure in a single-repository mode.
+
+  Example: ``module = branches/branch.name``
+
 tla
 %%%