Changeset 692 in tailor

Timestamp:

08/25/05 23:17:26 (8 years ago)

Author:

Robin Farine <robin.farine@…>

Hash name:

20050825211726-9b991-ad1ed58010cf1d452b3244fd06c7a156906285ac

Message:

tla: shared vs separate source and target SCM working directories
'tla' as source SCM handles a shared source and target working directory
in a less efficient and safe manner than the case where they are distinct.
In the shared case, 'tla' has to set aside filesystem entries the target
backend may have added before it applies a changeset and has to restore
them afterwards.

File:

• vcpx/tla.py (modified) (3 diffs)

vcpx/tla.py

@@ -80 +80 @@
         """
 
-        tempdir = self.__hide_foreign_entries()
-        try:
-            c = ExternalCommand(cwd=self.basedir,
-                                command=[self.repository.TLA_CMD, "replay"])
-            out, err = c.execute(changeset.revision, stdout=PIPE, stderr=PIPE)
-            if not c.exit_status in [0, 1]:
-                raise ChangesetApplicationFailure(
-                    "%s returned status %d saying \"%s\"" %
-                    (str(c), c.exit_status, err.read()))
-            # drop initial line: "* patching for revision ..."
-            out.readline()
-            conflicts = self.__parse_apply_changeset_output(changeset, out)
-        finally:
-            if tempdir:
-                self.__restore_foreign_entries(tempdir)
+        if self.shared_basedirs:
+            tempdir = self.__hide_foreign_entries()
+            try:
+                conflicts = self.__apply_changeset(changeset)
+            finally:
+                if tempdir:
+                    self.__restore_foreign_entries(tempdir)
+        else:
+            conflicts = self.__apply_changeset(changeset)
         return conflicts
 
@@ -103 +97 @@
 
         fqrev = self.__initial_revision(revision)
-        tempdir = mkdtemp("", ",,tailor-", self.basedir)
-        try:
-            c = ExternalCommand(cwd=os.path.join(self.basedir, tempdir),
-                                command=[self.repository.TLA_CMD, "get",
-                                         "--no-pristine", fqrev, "t"])
-            out, err = c.execute(stdout=PIPE, stderr=PIPE)
-            if c.exit_status:
-                raise TargetInitializationFailure(
-                    "%s returned status %d saying \"%s\"" %
-                    (str(c), c.exit_status, err.read()))
-            newtree = os.path.join(tempdir, "t")
-            for e in os.listdir(newtree):
-                os.rename(os.path.join(newtree, e),
-                          os.path.join(self.basedir,e))
-        finally:
-            try:
-                for root, dirs, files in os.walk(tempdir, topdown=False):
-                    for name in files:
-                        os.remove(os.path.join(root, name))
-                    for name in dirs:
-                        os.rmdir(os.path.join(root, name))
+        if self.shared_basedirs:
+            tempdir = mkdtemp("", ",,tailor-", self.basedir)
+            try:
+                self.__checkout_initial_revision(fqrev, tempdir, "t")
+            finally:
+                newtree = os.path.join(tempdir, "t")
+                if os.path.exists(newtree):
+                    for e in os.listdir(newtree):
+                        os.rename(os.path.join(newtree, e),
+                                  os.path.join(self.basedir, e))
+                    os.rmdir(newtree)
                 os.rmdir(tempdir)
-            except:
-                pass
+        else:
+            root, destdir = os.path.split(self.basedir)
+            self.__checkout_initial_revision(fqrev, root, destdir)
         return self.__parse_revision_logs([fqrev], False)[0]
 
     ## TlaWorkingDir private helper functions
+
+    def __checkout_initial_revision(self, fqrev, root, destdir):
+        if not os.path.exists(root):
+            os.makedirs(root)
+        c = ExternalCommand(cwd=root,
+                            command=[self.repository.TLA_CMD, "get",
+                                     "--no-pristine", fqrev, destdir])
+        out, err = c.execute(stdout=PIPE, stderr=PIPE)
+        if c.exit_status:
+            raise TargetInitializationFailure(
+                "%s returned status %d saying \"%s\"" %
+                (str(c), c.exit_status, err.read()))
+
+    def __apply_changeset(self, changeset):
+        c = ExternalCommand(cwd=self.basedir,
+                            command=[self.repository.TLA_CMD, "replay"])
+        out, err = c.execute(changeset.revision, stdout=PIPE, stderr=PIPE)
+        if not c.exit_status in [0, 1]:
+            raise ChangesetApplicationFailure(
+                "%s returned status %d saying \"%s\"" %
+                (str(c), c.exit_status, err.read()))
+        # drop initial line: "* patching for revision ..."
+        out.readline()
+        return self.__parse_apply_changeset_output(changeset, out)
 
     def __normalize_path(self, path):
@@ -206 +215 @@
                             command=[self.repository.TLA_CMD,
                                      "tree-lint", "-tu"])
-        out = c.execute(stdout=PIPE)
+        out = c.execute(stdout=PIPE)[0]
         tempdir = None
         if c.exit_status: