Changeset 891 in tailor

Timestamp:

10/12/05 16:50:22 (8 years ago)

Author:

lele@…

Hash name:

20051012145022-7a6fb-072a6272a0d41366e0077494a8d03bec053ade13

Message:

Verify that the URL points to the Subversion repository root
This is a major source of failure, since the svn log parser needs to
know the root of the repository to be able to properly recognize
entries path names.

File:

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

vcpx/svn.py

@@ -16 +16 @@
      ChangesetApplicationFailure, GetUpstreamChangesetsFailure
 from target import SyncronizableTargetWorkingDir, TargetInitializationFailure
+from config import ConfigurationError
 
 def changesets_from_svnlog(log, repository, module):
@@ -270 +271 @@
         from os.path import join, exists
 
+        # Verify that the we have the root of the repository: do that
+        # iterating an "svn ls" over the hierarchy until one fails
+
+        cmd = self.repository.command("ls")
+        svnls = ExternalCommand(command=cmd)
+        svnls.execute(self.repository.repository)
+
+        lastok = self.repository.repository
+        reporoot = lastok[:lastok.rfind('/')]
+        while '/' in reporoot:
+            svnls.execute(reporoot)
+            if svnls.exit_status:
+                break
+            lastok = reporoot
+            reporoot = reporoot[:reporoot.rfind('/')]
+
+        if lastok <> self.repository.repository:
+            module = self.repository.repository[len(lastok):]
+            module += self.repository.module
+            raise ConfigurationError("Non-root svn repository %r. "
+                                     "Please specify that as 'repository=%s' "
+                                     "and 'module=%s'." %
+                                     (self.repository.repository,
+                                      lastok, module.rstrip('/')))
+
         if revision == 'INITIAL':
             initial = True