Changeset 19 in tailor

Timestamp:

06/22/04 00:02:48 (9 years ago)

Author:

lele@…

Hash name:

20040621220248-97f81-5455781361206ece5a9be9397f289213bfa892aa

Message:

Factored out the _initializeWorkingDirectory method

Location:

vcpx

Files:

• cvs.py (modified) (1 diff)
• target.py (modified) (2 diffs)
• darcs.py (modified) (2 diffs)
• svn.py (modified) (1 diff)

vcpx/cvs.py

@@ -291 +291 @@
         self._addEntry(root, newentry)
 
-    def _initializeWorkingDir(self, root):
+    def _initializeWorkingDir(self, root, addentry=None):
         """
         Add the given directory to an already existing CVS working tree.
         """
-        
-        from os.path import split, walk
-
-        basedir,wdir = split(root)
-        c = CvsAdd(working_dir=basedir)
-        c(entry=wdir)
-
-        for dir, subdirs, files in walk(root):
-            if '.svn' in subdirs:
-                subdirs.remove('.svn')
-            if '_darcs' in subdirs:
-                subdirs.remove('_darcs')
-            c = CvsAdd(working_dir=dir)
-            for d in subdirs+files:
-                c(entry=d)
+
+        SyncronizableTargetWorkingDir._initializeWorkingDir(self, root, CvsAdd)

vcpx/target.py

@@ -87 +87 @@
                      'Tailorization of %s@%s' % (repository, revision))
 
-    def _initializeWorkingDir(self, root):
+    def _initializeWorkingDir(self, root, addentry=None):
         """
         Assuming the `root` directory is a new working copy extracted
@@ -93 +93 @@
         target repository.
         """
+
+        assert addentry, "Subclass should have specified something as addentry"
         
-        raise "%s should override this method" % self.__class__
+        from os.path import split, walk
+
+        basedir,wdir = split(root)
+        c = addentry(working_dir=basedir)
+        c(entry=wdir)
+
+        for dir, subdirs, files in walk(root):
+            for excd in ['.svn', '_darcs', 'CVS']:
+                if excd in subdirs:
+                    subdirs.remove(excd)
+
+            c = addentry(working_dir=dir)
+            for d in subdirs+files:
+                c(entry=d)
+

vcpx/darcs.py

@@ -144 +144 @@
         self._createTag(root, 'Upstream revision %s' % revision)
 
-    def _initializeWorkingDir(self, root):
-        """
-        Execute `darcs initialize`.
-        """
-        
-        c = DarcsInitialize(working_dir=root)
-        c(output=True)
-
     def _createTag(self, root, tagname):
         """
@@ -181 +173 @@
             
             return tagname
+
+    def _initializeWorkingDir(self, root):
+        """
+        Execute `darcs initialize`.
+        """
+        
+        c = DarcsInitialize(working_dir=root)
+        c(output=True)
+

vcpx/svn.py

@@ -253 +253 @@
         c(old=oldentry, new=newentry)
 
-    def _initializeWorkingDir(self, root):
+    def _initializeWorkingDir(self, root, addentry=None):
         """
         Add the given directory to an already existing svn working tree.
         """
         
-        from os.path import split, walk
-
-        basedir,wdir = split(root)
-        c = SvnAdd(working_dir=basedir)
-        c(entry=wdir)
-
-        for dir, subdirs, files in walk(root):
-            if 'CVS' in subdirs:
-                subdirs.remove('CVS')
-            if '_darcs' in subdirs:
-                subdirs.remove('_darcs')
-            c = SvnAdd(working_dir=dir)
-            for d in subdirs+files:
-                c(entry=d)
-
+        SyncronizableTargetWorkingDir._initializeWorkingDir(self, root, SvnAdd)