Changeset 608 in tailor

Timestamp:

08/17/05 02:23:07 (8 years ago)

Author:

lele@…

Hash name:

20050817002307-97f81-0ba3e1234a097057caad008b39bddfeecc30089f

Message:

Allow disjunct working directories
If the source and target repository use different directories, use
rsync to keep the target aligned with source, after the initial
checkout and right after the application of the upstream patch.

File:

• vcpx/dualwd.py (modified) (4 diffs)

vcpx/dualwd.py

@@ -11 +11 @@
 working copy shared between the two VC systems.
 
+In a slightly more elaborated way, the source and the target system may
+use separate directories, that gets rsynced when needed.
+
 This module implements `DualWorkingDir`, which instances have a
 `source` and `target` properties offering the right capabilities to do
@@ -20 +23 @@
 from source import UpdatableSourceWorkingDir, InvocationError
 from target import SyncronizableTargetWorkingDir
+from shwrap import ExternalCommand
 
 IGNORED_METADIRS = []
@@ -48 +52 @@
 
         self.prepareWorkingDirectory = self.target.prepareWorkingDirectory
-        self.importFirstRevision = self.target.importFirstRevision
-        self.replayChangeset = self.target.replayChangeset
 
     def setStateFile(self, state_file):
@@ -70 +72 @@
                                                   applyable=applyable,
                                                   applied=applied)
+
+    def importFirstRevision(self, source_repo, changeset, initial):
+        if self.source.basedir <> self.target.basedir:
+            self._syncTargetWithSource()
+        self.target.importFirstRevision(source_repo, changeset, initial)
+
+    def replayChangeset(self, changeset):
+        if self.source.basedir <> self.target.basedir:
+            self._syncTargetWithSource()
+        self.target.replayChangeset(changeset)
+
+    def _syncTargetWithSource(self):
+        cmd = ['rsync', '--delete', '--archive',
+               '--exclude', self.source.repository.METADIR,
+               '--exclude', self.target.repository.METADIR]
+        rsync = ExternalCommand(command=cmd)
+        rsync.execute(self.source.basedir+'/', self.target.basedir)