Changeset 304 in tailor

Timestamp:

05/18/05 17:17:43 (8 years ago)

Author:

rghetta <birrachiara@…>

Hash name:

20050518151743-2a8e2-9eb92aff73a452ba64d21bb7fb11ab0dc5f6fbc4

Message:

Use the new --message-file option of monotone
This patch make tailor use the new --message-file option of monotone,
avoiding the need to write directly into MT/log or quote the changelog
message.

In line with the other targets, the directory you give on tailor command
line needs to be a monotone working directory, i.e. it must have an MT
subdir.

Upstream changesets will be written into root/module (or root/subdir,
if you used the --subdir option). If you don't want this subdir, you
can use "--subdir=.". Unfortunately, not all source repos support
it. For example, CVS accepts --subdir=. on a local dir, but pserver
fails.

Important note: the current (0.19) release of monotone *doesn't*
support the --message-file option. Until 0.20 comes out you need to
compile monotone from sources.

File:

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

vcpx/monotone.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import SystemCommand, shrepr
+from shwrap import SystemCommand, shrepr, ReopenableNamedTemporaryFile
 from source import UpdatableSourceWorkingDir, \
      ChangesetApplicationFailure, GetUpstreamChangesetsFailure
 from target import SyncronizableTargetWorkingDir, TargetInitializationFailure
+from sys import stderr
 
 class MonotoneCommit(SystemCommand):
-    COMMAND = "monotone commit --author=\"%(key)s\" --date=\"%(date)s\""
+    COMMAND = "monotone commit --author=\"%(key)s\" --date=\"%(date)s\" --message-file=\"%(logfile)s\" 2>&1"
 
     def __call__(self, output=None, dry_run=False, **kwargs):
 
-        from os.path import exists, join
-
-        if not exists(join(self.working_dir, 'MT')):
-            # If MonotoneCommit is called outside the working copy
-            # (i.e. there is no MT directory) we test if we are given
-            # only the subdir as entry to commit. In that case, switch
-            # to root/subdir as working directory and issue a commit
-            # without any entries.
-            
-            entries = kwargs['entries']
-            entries = entries.replace(' ', '')
-            entries = entries.strip('\"')
-            if (exists(join(self.working_dir, entries))):
-                self.working_dir = join(self.working_dir, entries)
-                kwargs['entries'] = ""
-            else:
-                raise TargetInitializationFailure("not a valid monotone working copy (MT directory is missing in %s)" % self.working_dir)
-
-        log = open(self.working_dir + "/MT/log", "w");
-
+        # the log message is written on a temporary file
+        rontf = ReopenableNamedTemporaryFile('mtn', 'tailor')
         logmessage = kwargs.get('logmessage')
         if logmessage:
-            log.write(logmessage + "\n")
-
-        log.close();
+            log = open(rontf.name, "w")
+            log.write(logmessage)
+            log.close()            
+        kwargs['logfile'] = rontf.name
 
         return SystemCommand.__call__(self, output=output,
@@ -89 +73 @@
             else:
                 changelog = "**** empty log message ****"
-        changelog = changelog.replace('"', '\\"')
         
-        # monotone date must be expressed as ISO8601 
+        # monotone dates must be expressed as ISO8601 
         outstr = c(output=True, key=author, logmessage=changelog,
                    date=date.isoformat(), entries=entries)
@@ -99 +82 @@
         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()      
         
@@ -131 +118 @@
 
         from os.path import exists, join
-        
-        if not exists(join(root, subdir, 'MT')):
-            raise TargetInitializationFailure("Please setup %s as a monotone working directory." % root)
 
-        c = SystemCommand(working_dir=join(root, subdir),
+        if not exists(join(root, 'MT')):
+            raise TargetInitializationFailure("Please setup '%s' as a monotone working directory" % root)
+
+        c = SystemCommand(working_dir=root,
                           command="monotone add %(names)s")
-        c(names='.')
+        c(names=subdir)