Changeset 698 in tailor

Timestamp:

08/25/05 20:03:55 (8 years ago)

Author:

R.Ghetta <birrachiara@…>

Hash name:

20050825180355-2c016-29f3a33040f39037436fb00ee30c7a33bcbb3371

Message:

some fixes for monotone

File:

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

vcpx/monotone.py

@@ -456 +456 @@
     def _applyChangeset(self, changeset):
         cmd = [self.repository.MONOTONE_CMD, "update", "--revision", changeset.revision]
-        mtl = ExternalCommand(cwd=self.repository.rootdir, command=cmd)
+        mtl = ExternalCommand(cwd=self.basedir, command=cmd)
         mtl.execute()
         if mtl.exit_status:
@@ -486 +486 @@
         # ok, now the workdir contains the checked out revision. We need to return a changeset
         # describing it. 
-        if not hasattr(self, "oldrev"):
-            self.oldrev=None
         mtr = MonotoneRevToCset(repository=self.repository, working_dir=self.basedir)
-        csetlist = mtr.getCset( [self.oldrev, effrev], True )
-        self.oldrev = effrev
+        csetlist = mtr.getCset( [None, effrev], True )
         return csetlist[0]
             
@@ -660 +657 @@
 
         cmd = [self.repository.MONOTONE_CMD, "setup",
-               "--db", self.repository.repository]
-        if self.repository.module:
-            cmd.extend(["--branch", self.repository.module])
+               "--db", self.repository.repository, "--branch", self.repository.module]
+        if !self.repository.module:
+            raise TargetInitializationFailure("Monotone needs a module defined (to be used as commit branch)")
 
         setup = ExternalCommand(command=cmd)