Changeset 704 in tailor

Timestamp:

08/27/05 17:44:23 (8 years ago)

Author:

R.Ghetta <birrachiara@…>

Hash name:

20050827154423-2c016-4efd6ae519371fc331c1ddc032822b64ff408023

Message:

aligned wc handling to other backends, small cleanings

File:

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

vcpx/monotone.py

@@ -441 +441 @@
         # now childs is a list of revids, we must transform it in a list of changesets
         childs = outstr[0].getvalue().split()
-#        mtr = MonotoneRevToCset(repository=self.repository, working_dir=self.basedir)
-#        allrev = [sincerev]
-#        allrev.extend(childs)
-#        return mtr( allrev, False )
         chlist = []
         anc=sincerev
@@ -459 +455 @@
         mtl.execute()
         if mtl.exit_status:
-            self.log_info("'mtn update' returned status %s" % mtl.exit_status)
-#            raise ChangesetApplicationFailure("'mtn update' returned status %s" % mtl.exit_status)
+#        self.log_info("'mtn update' returned status %s" % mtl.exit_status)
+            raise ChangesetApplicationFailure("'mtn update' returned status %s" % mtl.exit_status)
         self.oldrev = changeset.lin_ancestor
         mtr = MonotoneRevToCset(repository=self.repository, working_dir=self.basedir)
@@ -502 +498 @@
             else:
                 fnames.append(fn)
-
-        cmd = [self.repository.MONOTONE_CMD, "add"]
-        add = ExternalCommand(cwd=self.basedir, command=cmd)
-        add.execute(fnames)
-        if add.exit_status:
-            raise ChangesetApplicationFailure("%s returned status %s" % (str(add),add.exit_status))
+        if len(fnames):
+            # ok, we still have something to add
+            cmd = [self.repository.MONOTONE_CMD, "add"]
+            add = ExternalCommand(cwd=self.basedir, command=cmd)
+            add.execute(fnames)
+            if add.exit_status:
+                raise ChangesetApplicationFailure("%s returned status %s" % (str(add),add.exit_status))
+        
 
     def _addSubtree(self, subdir):
@@ -592 +590 @@
         cmd = [self.repository.MONOTONE_CMD, "rename"]
         rename = ExternalCommand(cwd=self.basedir, command=cmd)
-        o1, o2 =rename.execute(oldname, newname, stderr=PIPE)
-        stderr.write(o2.read())
+        rename.execute(oldname, newname)
         
         # redo the rename ...
@@ -684 +681 @@
         Setup the monotone working copy
 
-        The user must setup a monotone working directory himself. Then
+        The user must setup a monotone working directory himself or use the
+        tailor config file to provide parameters for creation. Then
         we simply use 'monotone commit', without having to specify a database
         file or branch. Monotone looks up the database and branch in it's MT
@@ -693 +691 @@
             raise TargetInitializationFailure("Please setup '%s' as a monotone working directory" % self.basedir)
 
-        self._addSubtree([self.repository.subdir])
+#        self._addSubtree([self.repository.subdir])
+        SyncronizableTargetWorkingDir._initializeWorkingDir(self)