Changeset 826 in tailor

Timestamp:

09/21/05 00:20:34 (8 years ago)

Author:

lele@…

Hash name:

20050920222034-97f81-d9e12c2087cf2fe809b483d2a03a52c69486e3ef

Message:

Execute the pre and post commit hooks at bootstrap time
This closes #6, allowing the customization of the initial changeset (even
if only when starting from INITIAL).

File:

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

vcpx/target.py

@@ -61 +61 @@
     """
 
-    def replayChangeset(self, changeset):
-        """
-        Do whatever is needed to replay the changes under the target
-        VC, to register the already applied (under the other VC)
-        changeset.
-        """
-
-        changeset = self._adaptChangeset(changeset)
-        if changeset is None:
-            return
-
-        try:
-            self._replayChangeset(changeset)
-        except:
-            self.log_error(str(changeset), exc=True)
-            raise
+    def __getPatchNameAndLog(self, changeset):
+        """
+        Return a tuple (patchname, changelog) interpolating changeset's
+        information with the template above.
+        """
 
         if changeset.log == '':
@@ -100 +89 @@
         else:
             changelog = changeset.log
+        return patchname, changelog
+
+    def replayChangeset(self, changeset):
+        """
+        Do whatever is needed to replay the changes under the target
+        VC, to register the already applied (under the other VC)
+        changeset.
+        """
+
+        changeset = self._adaptChangeset(changeset)
+        if changeset is None:
+            return
+
+        try:
+            self._replayChangeset(changeset)
+        except:
+            self.log_error(str(changeset), exc=True)
+            raise
+        patchname, log = self.__getPatchNameAndLog(changeset)
         entries = self._getCommitEntries(changeset)
-        self._commit(changeset.date, changeset.author,
-                     patchname, changelog, entries)
+        self._commit(changeset.date, changeset.author, patchname, log, entries)
         self._dismissChangeset(changeset)
 
@@ -393 +400 @@
 
         self._initializeWorkingDir()
+        # Execute the precommit hooks, but ignore None results
+        changeset = self._adaptChangeset(changeset) or changeset
         revision = changeset.revision
         source_repository = str(source_repo)
         if initial:
             author = changeset.author
-            patchname = changeset.log
-            log = None
+            patchname, log = self.__getPatchNameAndLog(changeset)
         else:
             author = "%s@%s" % (AUTHOR, HOST)
@@ -404 +412 @@
             log = BOOTSTRAP_CHANGELOG % locals()
         self._commit(changeset.date, author, patchname, log)
+        self._dismissChangeset(changeset)
 
     def _initializeWorkingDir(self):