Changeset 596 in tailor

Timestamp:

08/16/05 22:15:38 (8 years ago)

Author:

R.Ghetta <birrachiara@…>

Hash name:

20050816201538-2c016-42f18a85dee805089e54c56a0acdea806452fc08

Message:

Small improvement to monotone backend

File:

• vcpx/monotone.py (modified) (6 diffs)

vcpx/monotone.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import ExternalCommand, PIPE, ReopenableNamedTemporaryFile
+from shwrap import ExternalCommand, PIPE, ReopenableNamedTemporaryFile, STDOUT
 from source import UpdatableSourceWorkingDir, \
      ChangesetApplicationFailure, GetUpstreamChangesetsFailure
 from target import SyncronizableTargetWorkingDir, TargetInitializationFailure
 from sys import stderr
+from os.path import exists, join, isdir
+from os import renames, access, F_OK
 
 class MonotoneWorkingDir(SyncronizableTargetWorkingDir):
@@ -24 +26 @@
     def _addPathnames(self, names):
         """
-        Add some new filesystem objects.
+        Add some new filesystem objects, skipping directories (directory addition is implicit in monotone)
         """
+        fnames=[]
+        for fn in names:
+            if isdir(join(self.basedir, fn)):
+                self.log_info("ignoring addition of directory '%s' (%s)" % (fn, join(self.basedir, fn)) );
+            else:
+                fnames.append(fn)
 
         cmd = [self.repository.MONOTONE_CMD, "add"]
         add = ExternalCommand(cwd=self.basedir, command=cmd)
-        add.execute(names)
+        add.execute(fnames)
+        if add.exit_status:
+            raise ChangesetApplicationFailure("%s returned status %s" % (str(add),add.exit_status))
+
+    def _addSubtree(self, subdir):
+        """
+        Add a whole subtree
+        """
+        cmd = [self.repository.MONOTONE_CMD, "add"]
+        add = ExternalCommand(cwd=self.basedir, command=cmd)
+        add.execute(subdir)
+        if add.exit_status:
+            raise ChangesetApplicationFailure("%s returned status %s" % (str(add),add.exit_status))
 
     def _commit(self, date, author, patchname, changelog=None, entries=None):
@@ -68 +88 @@
             text = error.read()
             if text.find("monotone: misuse: no changes to commit") == -1:
-                stderr.write(text)
+                self.log_error(text)
                 raise ChangesetApplicationFailure(
                     "%s returned status %s" % (str(commit),commit.exit_status))
@@ -76 +96 @@
     def _removePathnames(self, names):
         """
-        Remove some filesystem object.
+        Remove some filesystem object. 
         """
 
+        # Monotone currently doesn't allow removing a directory,
+        # so we must remove every item separately and intercept monotone directory errore messages.
+        # We can't just filter the directories, because the wc doesn't contain them anymore ...
         cmd = [self.repository.MONOTONE_CMD, "drop"]
         drop = ExternalCommand(cwd=self.basedir, command=cmd)
-        drop.execute(names)
+        for fn in names:
+            dum, error = drop.execute(fn, stderr=PIPE)
+            if drop.exit_status:
+                if not error.read().find("drop <directory>"):
+                    log_error(error.read())
+                    raise ChangesetApplicationFailure("%s returned status %s" % (str(drop),drop.exit_status))
 
     def _renamePathname(self, oldname, newname):
@@ -87 +115 @@
         Rename a filesystem object.
         """
-
+        # this function is called *after* the file/dir has changed name,
+        # and monotone doesn't like it.
+        # we put names back to make it happy ...
+        if access(join(self.basedir, newname), F_OK):
+            if access(join(self.basedir, oldname), F_OK):
+                raise ChangesetApplicationFailure("Can't rename %s to %s. Both names already exist" % (oldname, newname) )
+            renames(join(self.basedir, newname), join(self.basedir, oldname))
+            self.log_info("preparing to rename %s->%s" % (oldname, newname))
+        
         cmd = [self.repository.MONOTONE_CMD, "rename"]
         rename = ExternalCommand(cwd=self.basedir, command=cmd)
-        rename.execute(oldname, newname)
+        o1, o2 =rename.execute(oldname, newname, stderr=PIPE)
+        stderr.write(o2.read())
+        
+        # redo the rename ...
+        renames(join(self.basedir, oldname), join(self.basedir, newname))
+        if rename.exit_status:
+            raise ChangesetApplicationFailure("%s returned status %s" % (str(rename),rename.exit_status))
 
     def _initializeWorkingDir(self):
@@ -102 +144 @@
         """
 
-        from os.path import exists, join
-
         if not exists(join(self.basedir, 'MT')):
             raise TargetInitializationFailure("Please setup '%s' as a monotone working directory" % self.basedir)
 
-        self._addPathnames([self.repository.subdir])
+        self._addSubtree([self.repository.subdir])