Changeset 426 in tailor

Timestamp:

07/25/05 23:40:28 (8 years ago)

Author:

lele@…

Hash name:

20050725214028-97f81-36aa171e639fa273afa4c08dc92c6b7f416b62dc

Message:

Use the last applied patch timestamp for the bootstrap date

Location:

vcpx

Files:

• cvsps.py (modified) (2 diffs)
• source.py (modified) (1 diff)
• target.py (modified) (2 diffs)
• darcs.py (modified) (2 diffs)
• svn.py (modified) (1 diff)
• tailor.py (modified) (1 diff)
• cdv.py (modified) (2 diffs)
• bzr.py (modified) (2 diffs)
• session.py (modified) (3 diffs)

vcpx/cvsps.py

@@ -260 +260 @@
         the name of the tag to get, or as a date if it starts with a number.
 
-        Return the effective cvsps revision.
+        Return the last applied changeset.
         """
 
@@ -336 +336 @@
                                    last.revision)
             
-        return last.revision
+        return last
     
     def _willApplyChangeset(self, root, changeset, applyable=None):

vcpx/source.py

@@ -167 +167 @@
         :revision: extract that revision/branch
 
-        Return the checked out revision.
+        Return the last applied changeset.
         """
 

vcpx/target.py

@@ -316 +316 @@
         raise "%s should override this method" % self.__class__
 
-    def initializeNewWorkingDir(self, root, repository, module, subdir, revision):
+    def initializeNewWorkingDir(self, root, repository, module, subdir,
+                                changeset):
         """
         Initialize a new working directory, just extracted from
@@ -322 +323 @@
         """
 
-        from datetime import datetime
-
-        now = datetime.now()
         self._initializeWorkingDir(root, repository, module, subdir)
         patchname = BOOTSTRAP_PATCHNAME % module
+        revision = changeset.revision
         changelog = BOOTSTRAP_CHANGELOG % locals()
-        self._commit(root, now, '%s@%s' % (AUTHOR, HOST), patchname, changelog,
-                     entries=[subdir])
+        self._commit(root, changeset.date, '%s@%s' % (AUTHOR, HOST), patchname,
+                     changelog, entries=[subdir])
 
     def _initializeWorkingDir(self, root, repository, module, subdir):

vcpx/darcs.py

@@ -223 +223 @@
                                   subdir=None, logger=None, **kwargs):
         """
-        Concretely do the checkout of the upstream revision.
+        Concretely do the checkout of the upstream revision and return
+        the last applied changeset.
         """
 
@@ -283 +284 @@
         last = changesets_from_darcschanges(output)
         
-        return last[0].revision
+        return last[0]
 
     

vcpx/svn.py

@@ -260 +260 @@
         info = self.__getSvnInfo(wdir)
         
-        actual = info['Revision']
+        cmd = [SVN_CMD, "log", "--verbose", "--xml", "--revision", revision]
+        svnlog = ExternalCommand(cwd=wdir, command=cmd)
+        output = svnlog.execute(stdout=PIPE)
+        
+        if svnlog.exit_status:
+            raise ChangesetApplicationFailure(
+                "%s returned status %d saying \"%s\"" %
+                (str(changes), changes.exit_status, output.read()))
+        
+        csets = changesets_from_svnlog(output, info['URL'], repository, module)
+        
+        last = csets[0]
         
         if logger: logger.info("working copy up to svn revision %s",
-                               actual)
-        
-        return actual 
+                               last.revision)
+
+        return last
     
     ## SyncronizableTargetWorkingDir

vcpx/tailor.py

@@ -345 +345 @@
         self.module = module
         self.subdir = subdir
-        self.upstream_revision = actual
+        self.upstream_revision = actual.revision
 
         self.__saveStatus()

vcpx/cdv.py

@@ -63 +63 @@
         ExternalCommand(cwd=root, command=cmd).execute(oldname, newname)
 
-    def initializeNewWorkingDir(self, root, repository, module, subdir, revision):
+    def initializeNewWorkingDir(self, root, repository, module, subdir,
+                                changeset):
         """
         Initialize a new working directory, just extracted from
@@ -69 +70 @@
         """
 
-        from datetime import datetime
         from target import AUTHOR, HOST, BOOTSTRAP_PATCHNAME, \
              BOOTSTRAP_CHANGELOG
         
-        now = datetime.now()
         self._initializeWorkingDir(root, repository, module, subdir)
-        self._commit(root, now, '%s@%s' % (AUTHOR, HOST),
+        self._commit(root, changeset.date, '%s@%s' % (AUTHOR, HOST),
                      BOOTSTRAP_PATCHNAME % module,
                      BOOTSTRAP_CHANGELOG % locals(),

vcpx/bzr.py

@@ -61 +61 @@
         ExternalCommand(cwd=root, command=cmd).execute(old, new)
 
-    def initializeNewWorkingDir(self, root, repository, module, subdir, revision):
+    def initializeNewWorkingDir(self, root, repository, module, subdir,
+                                changeset):
         """
         Initialize a new working directory, just extracted from
@@ -67 +68 @@
         """
 
-        from datetime import datetime
         from target import AUTHOR, HOST, BOOTSTRAP_PATCHNAME, \
              BOOTSTRAP_CHANGELOG
         
-        now = datetime.now()
         self._initializeWorkingDir(root, repository, module, subdir)
-        self._commit(root, now, AUTHOR,
+        self._commit(root, changeset.date, AUTHOR,
                      BOOTSTRAP_PATCHNAME % module,
                      BOOTSTRAP_CHANGELOG % locals(),

vcpx/session.py

@@ -499 +499 @@
 
         try:
-            self.source_revision = dwd.checkoutUpstreamRevision(
+            actual = dwd.checkoutUpstreamRevision(
                 self.current_directory, self.source_repository,
                 self.source_module, revision,
@@ -506 +506 @@
             self.__err('Checkout failed', True)
             return
+
+        self.source_revision = actual.revision
         
         self.writeStateFile()
@@ -514 +516 @@
                                         self.source_module,
                                         self.sub_directory,
-                                        self.source_revision)
+                                        actual)
         except:
             self.__err('Working copy initialization failed', True)