Changeset 431 in tailor

Timestamp:

07/26/05 02:16:25 (8 years ago)

Author:

lele@…

Hash name:

20050726001625-97f81-b51941608932253b428c9298c142c1b69f363a63

Message:

Better handling of initial revision, expecially for darcs
Now tailor accepts --revision=INITIAL also for darcs: when specifying
INITIAL as revision, tailor uses the author, date and changelog of the
first changeset for the bootstrap.

Location:

vcpx

Files:

• target.py (modified) (2 diffs)
• darcs.py (modified) (5 diffs)
• tailor.py (modified) (2 diffs)
• cdv.py (modified) (2 diffs)
• bzr.py (modified) (2 diffs)
• session.py (modified) (1 diff)

vcpx/target.py

@@ -317 +317 @@
 
     def initializeNewWorkingDir(self, root, repository, module, subdir,
-                                changeset):
+                                changeset, initial):
         """
         Initialize a new working directory, just extracted from
@@ -324 +324 @@
 
         self._initializeWorkingDir(root, repository, module, subdir)
-        patchname = BOOTSTRAP_PATCHNAME % module
         revision = changeset.revision
-        changelog = BOOTSTRAP_CHANGELOG % locals()
-        self._commit(root, changeset.date, '%s@%s' % (AUTHOR, HOST), patchname,
-                     changelog, entries=[subdir])
+        if initial:
+            author = changeset.author
+            remark = changeset.log
+            log = None
+        else:
+            author = "%s@%s" % (AUTHOR, HOST)
+            remark = BOOTSTRAP_PATCHNAME % module
+            log = BOOTSTRAP_CHANGELOG % locals()
+        self._commit(root, changeset.date, author, remark, log,
+                     entries=[subdir])
 
     def _initializeWorkingDir(self, root, repository, module, subdir):

vcpx/darcs.py

@@ -197 +197 @@
         """
 
+        from re import escape
+        
         if changeset.revision.startswith('tagged '):
             selector = '--tags'
@@ -202 +204 @@
         else:
             selector = '--patches'
-            revtag = changeset.revision
+            revtag = escape(changeset.revision)
             
         cmd = [DARCS_CMD, "pull", "--all", selector, revtag]
@@ -229 +231 @@
         from os.path import join, exists
         from os import mkdir
-
+        from re import escape
+        
+        if revision == 'INITIAL':
+            initial = True
+            cmd = [DARCS_CMD, "changes", "--xml-output", "--repo", repository]
+            changes = ExternalCommand(command=cmd)
+            output = changes.execute(stdout=PIPE, stderr=STDOUT)
+
+            if changes.exit_status:
+                raise ChangesetApplicationFailure(
+                    "%s returned status %d saying \"%s\"" %
+                    (str(changes), changes.exit_status, output.read()))
+
+            csets = changesets_from_darcschanges(output)
+            revision = escape(csets[0].revision)
+        else:
+            initial = False
+
+        wdir = join(basedir, subdir)
         if subdir == '.':
             # This is currently *very* slow, compared to the darcs get
             # below!
-            wdir = basedir
             if not exists(join(wdir, '_darcs')):
                 if not exists(wdir):
@@ -249 +268 @@
                 cmd = [DARCS_CMD, "pull", "--all", "--verbose"]
                 if revision and revision<>'HEAD':
-                    cmd.extend(["--tag", revision])
+                    cmd.extend([initial and "--patches" or "--tags", revision])
                 dpull = ExternalCommand(cwd=wdir, command=cmd)
                 output = dpull.execute(repository, stdout=PIPE, stderr=STDOUT)
@@ -259 +278 @@
         else:
             # Use much faster 'darcs get'
-            
-            wdir = join(basedir, subdir)
             cmd = [DARCS_CMD, "get", "--partial", "--verbose"]
             if revision and revision<>'HEAD':
-                cmd.extend(["--tag", revision])
+                cmd.extend([initial and "--to-patch" or "--tag", revision])
             dget = ExternalCommand(cwd=basedir, command=cmd)
             output = dget.execute(repository, subdir,

vcpx/tailor.py

@@ -336 +336 @@
 
         try:
-            dwd.initializeNewWorkingDir(self.root, repository, module, subdir, actual)
+            dwd.initializeNewWorkingDir(self.root, repository, module, subdir,
+                                        actual, revision=='INITIAL')
         except:
             self.logger.exception('Working copy initialization failed!')
@@ -525 +526 @@
                      "name, a timestamp or both separated by a space, and "
                      "timestamp may be 'INITIAL' to denote the beginning of "
-                     "time for the given branch. "
+                     "time for the given branch. Under Darcs, INITIAL is a "
+                     "shortcut for the name of the first patch in the upstream "
+                     "repository, otherwise it is interpreted as the name of "
+                     "a tag. "
                      "'HEAD', the default, means the latest version in all "
                      "backends.",

vcpx/cdv.py

@@ -64 +64 @@
 
     def initializeNewWorkingDir(self, root, repository, module, subdir,
-                                changeset):
+                                changeset, initial):
         """
         Initialize a new working directory, just extracted from
@@ -75 +75 @@
         self._initializeWorkingDir(root, repository, module, subdir)
         revision = changeset.revision
-        self._commit(root, changeset.date, '%s@%s' % (AUTHOR, HOST),
-                     BOOTSTRAP_PATCHNAME % module,
-                     BOOTSTRAP_CHANGELOG % locals(),
+        if initial:
+            author = changeset.author
+            remark = changeset.log
+            log = None
+        else:
+            author = "%s@%s" % (AUTHOR, HOST)
+            remark = BOOTSTRAP_PATCHNAME % module
+            log = BOOTSTRAP_CHANGELOG % locals()
+        self._commit(root, changeset.date, author, remark, log,
                      entries=[subdir, '%s/...' % subdir])
 

vcpx/bzr.py

@@ -62 +62 @@
 
     def initializeNewWorkingDir(self, root, repository, module, subdir,
-                                changeset):
+                                changeset, initial):
         """
         Initialize a new working directory, just extracted from
@@ -70 +70 @@
         from target import AUTHOR, HOST, BOOTSTRAP_PATCHNAME, \
              BOOTSTRAP_CHANGELOG
-        
+
         self._initializeWorkingDir(root, repository, module, subdir)
         revision = changeset.revision
-        self._commit(root, changeset.date, AUTHOR,
-                     BOOTSTRAP_PATCHNAME % module,
-                     BOOTSTRAP_CHANGELOG % locals(),
+        if initial:
+            author = changeset.author
+            remark = changeset.log
+            log = None
+        else:
+            author = "%s@%s" % (AUTHOR, HOST)
+            remark = BOOTSTRAP_PATCHNAME % module
+            log = BOOTSTRAP_CHANGELOG % locals()
+        self._commit(root, changeset.date, author, remark, log,
                      entries=[subdir, '%s/...' % subdir])
 

vcpx/session.py

@@ -516 +516 @@
                                         self.source_module,
                                         self.sub_directory,
-                                        actual)
+                                        actual, revision=='INITIAL')
         except:
             self.__err('Working copy initialization failed', True)