Changeset 1558 in tailor

Timestamp:

05/26/08 02:20:06 (5 years ago)

Author:

lele@…

Hash name:

20080526002006-97f81-2e3195fa9cd2b66dcaa7d4d3f572ef03bd0f04a6

Message:

New option 'split-initial-changeset-level' on darcs target
This let's avoid building a single huge patch at bootstrap, and
instead having a set of smaller changesets, one per directory, with a
tag to collect them as a whole.

Files:

• vcpx/repository/darcs/__init__.py (modified) (1 diff)
• README.rst (modified) (2 diffs)
• vcpx/repository/darcs/target.py (modified) (1 diff)

vcpx/repository/darcs/__init__.py

@@ -32 +32 @@
             self.init_options = None
         self.use_look_for_adds = cget(self.name, 'look-for-adds', 'False')
+        self.split_initial_import_level = int(
+            cget(self.name, 'split-initial-changeset-level', '0'))
         self.replace_badchars = eval(cget(self.name, 'replace-badchars',
                                           "{"

README.rst

@@ -899 +899 @@
             ``subdir`` different from ``.``. [#]_
 
+split-initial-changeset-level : integer
+  Sometime it's desiderable to avoid the impact of the huge patch
+  produced by the bootstrap step, that's basically a snapshot of the
+  *whole* working directory. This option controls that: if greater
+  than zero, the inital import will be splitted in multiple
+  changesets, one per directory not deeper than the specified level. A
+  value of 1 will build a changeset for the top level contents
+  (directories and files), then a changeset for each subtree. Finally,
+  a *tag* will comprehend all the changesets.
+
+  *0* by default.
 
 Big repositories
@@ -917 +928 @@
     done
 
+When darcs is the *target*, consider setting a value of 1 or even 2
+for the option `split-initial-changeset-level`.
 
 git target

vcpx/repository/darcs/target.py

@@ -30 +30 @@
     A target working directory under ``darcs``.
     """
+
+    def importFirstRevision(self, source_repo, changeset, initial):
+        from os import walk, sep
+        from os.path import join
+        from vcpx.dualwd import IGNORED_METADIRS
+
+        if not self.repository.split_initial_import_level:
+            super(DarcsTargetWorkingDir, self).importFirstRevision(
+                source_repo, changeset, initial)
+        else:
+            cmd = self.repository.command("add", "--case-ok", "--quiet")
+            add = ExternalCommand(cwd=self.repository.basedir, command=cmd)
+            cmd = self.repository.command("add", "--case-ok", "--recursive",
+                                          "--quiet")
+            addrecurs = ExternalCommand(cwd=self.repository.basedir, command=cmd)
+            for root, dirs, files in walk(self.repository.basedir):
+                subtree = root[len(self.repository.basedir)+1:]
+                if subtree:
+                    log = "Import of subtree %s" % subtree
+                    level = len(subtree.split(sep))
+                else:
+                    log = "Import of first level"
+                    level = 0
+                for excd in IGNORED_METADIRS:
+                    if excd in dirs:
+                        dirs.remove(excd)
+                if level>self.repository.split_initial_import_level:
+                    while dirs:
+                        d = dirs.pop(0)
+                        addrecurs.execute(join(subtree, d))
+                    filenames = [join(subtree, f) for f in files]
+                    if filenames:
+                        add.execute(*filenames)
+                else:
+                    dirnames = [join(subtree, d) for d in dirs]
+                    if dirnames:
+                        add.execute(*dirnames)
+                    filenames = [join(subtree, f) for f in files]
+                    if filenames:
+                        add.execute(*filenames)
+                self._commit(changeset.date, "tailor", "Initial import",
+                             log, isinitialcommit=initial)
+
+            cmd = self.repository.command("tag", "--author", "tailor")
+            ExternalCommand(cwd=self.repository.basedir, command=cmd).execute(
+                "Initial import from %s" % source_repo.repository)
 
     def _addSubtree(self, subdir):