Changeset 393 in tailor for vcpx/monotone.py

Timestamp:

07/03/05 19:13:06 (8 years ago)

Author:

lele@…

Hash name:

20050703171306-97f81-11c9593de1896089b8be2153d79f4656276e3d86

Message:

Transition to a Python 2.4 subprocess compatible way of executing external tools
The shwrap module now makes use of the new subprocess module available
with Python 2.4; under older snakes it uses an almost compatible module,
_process.py. This does not bring in any new functionality, it should just
make it easier to port the tool under other OS, and hopefully use a less
hackish way of doing the task.

BEWARE: even if I did several round trips over the various backends, there
may still be bugs in the way I translated the external commands.

File:

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

vcpx/monotone.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import SystemCommand, shrepr, ReopenableNamedTemporaryFile
+from shwrap import ExternalCommand, PIPE, ReopenableNamedTemporaryFile
 from source import UpdatableSourceWorkingDir, \
      ChangesetApplicationFailure, GetUpstreamChangesetsFailure
@@ -18 +18 @@
 from sys import stderr
 
-class MonotoneCommit(SystemCommand):
-    COMMAND = "monotone commit --author=\"%(key)s\" --date=\"%(date)s\" --message-file=\"%(logfile)s\" 2>&1"
-
-    def __call__(self, output=None, dry_run=False, **kwargs):
-
-        # the log message is written on a temporary file
-        rontf = ReopenableNamedTemporaryFile('mtn', 'tailor')
-        logmessage = kwargs.get('logmessage')
-        if logmessage:
-            log = open(rontf.name, "w")
-            log.write(logmessage)
-            log.close()            
-        kwargs['logfile'] = rontf.name
-
-        return SystemCommand.__call__(self, output=output,
-                                      dry_run=dry_run, **kwargs)
-
-class MonotoneRemove(SystemCommand):
-    COMMAND = "monotone drop %(entry)s"
-
-
-class MonotoneMv(SystemCommand):
-    COMMAND = "monotone rename %(old)s %(new)s"
-
+MONOTONE_CMD = "monotone"
 
 class MonotoneWorkingDir(SyncronizableTargetWorkingDir):
@@ -52 +29 @@
         """
 
-        c = SystemCommand(working_dir=root, command="monotone add %(names)s")
-        c(names=' '.join([shrepr(n) for n in names]))
+        cmd = [MONOTONE_CMD, "add"]
+        add = ExternalCommand(cwd=root, command=cmd)
+        add.execute(names)
 
     def _commit(self,root, date, author, remark, changelog=None, entries=None):
@@ -60 +38 @@
         """
 
-        c = MonotoneCommit(working_dir=root)
+        rontf = ReopenableNamedTemporaryFile('mtn', 'tailor')
+        log = open(rontf.name, "w")
+        log.write(remark)
+        log.write('\n')
+        if changelog:
+            log.write(changelog)
+            log.write('\n')
+        log.close()
+
+        cmd = [MONOTONE_CMD, "commit", "--author", author,
+               "--date", date.isoformat(),
+               "--message-file", rontf.name]
+        commit = ExternalCommit(cwd=root, command=cmd)
         
-        if entries:
-            entries = ' '.join([shrepr(e) for e in entries])
-        else:
-            entries = '.'
+        if not entries:
+            entries = ['.']
 
-        # monotone doesn't like empty changelogs ...
-        if changelog == None or len(changelog)<1:
-            if len(remark)>0:
-                changelog = remark
-            else:
-                changelog = "**** empty log message ****"
-        
-        # monotone dates must be expressed as ISO8601 
-        outstr = c(output=True, key=author, logmessage=changelog,
-                   date=date.isoformat(), entries=entries)
+        output = commit.execute(entries, stdout=PIPE)
 
         # monotone complaints if there are no changes from the last commit.
         # we ignore those errors ...
-        if c.exit_status:
-           if outstr.getvalue().find("monotone: misuse: no changes to commit") == -1:
-               stderr.write(outstr.getvalue())
-               outstr.close()
-               raise TargetInitializationFailure(
-                  "'monotone commit returned %s" % c.exit_status)
-           else:
-               stderr.write("No changes to commit - changeset ignored\n")
-             
-        outstr.close()      
+        if commit.exit_status:
+            text = output.read()
+            if text.find("monotone: misuse: no changes to commit") == -1:
+                stderr.write(text)
+                raise TargetInitializationFailure(
+                    "%s returned status %s" % (str(commit),commit.exit_status))
+            else:
+                stderr.write("No changes to commit - changeset ignored\n")
         
     def _removePathnames(self, root, names):
@@ -96 +73 @@
         """
 
-        c = MonotoneRemove(working_dir=root)
-        c(entry=' '.join([shrepr(n) for n in names]))
+        cmd = [MONOTONE_CMD, "drop"]
+        drop = ExternalCommand(cwd=root, command=cmd)
+        drop.execute(names)
 
     def _renamePathname(self, root, oldname, newname):
@@ -104 +82 @@
         """
 
-        c = MonotoneMv(working_dir=root)
-        c(old=shrepr(oldname), new=shrepr(newname))
+        cmd = [MONOTONE_CMD, "rename"]
+        rename = ExternalCommand(cwd=root, command=cmd)
+        rename.execute(oldname, newname)
 
     def _initializeWorkingDir(self, root, repository, module, subdir):
@@ -122 +101 @@
             raise TargetInitializationFailure("Please setup '%s' as a monotone working directory" % root)
 
-        c = SystemCommand(working_dir=root,
-                          command="monotone add %(names)s")
-        c(names=subdir)
+        self._addPathnames(root, [subdir])