Changeset 191 in tailor

Timestamp:

12/28/04 19:26:00 (8 years ago)

Author:

lele@…

Hash name:

20041228182600-97f81-d17239f1ea951d566e3f1fa0f606d549927c5dd4

Message:

Use the name of the module for the patch name

Location:

vcpx

Files:

• cvsps.py (modified) (1 diff)
• source.py (modified) (2 diffs)
• target.py (modified) (4 diffs)
• darcs.py (modified) (1 diff)
• svn.py (modified) (2 diffs)
• dualwd.py (modified) (2 diffs)
• tailor.py (modified) (2 diffs)

vcpx/cvsps.py

@@ -499 +499 @@
         self._addEntry(root, newentry)
 
-    def _initializeWorkingDir(self, root, addentry=None):
+    def _initializeWorkingDir(self, root, repository, module, subdir, addentry=None):
         """
         Add the given directory to an already existing CVS working tree.
         """
 
-        SyncronizableTargetWorkingDir._initializeWorkingDir(self, root, CvsAdd)
-
-
+        SyncronizableTargetWorkingDir._initializeWorkingDir(self, root,
+                                                            repository, module,
+                                                            subdir, CvsAdd)
+
+

vcpx/source.py

@@ -66 +66 @@
     """
 
-    def applyUpstreamChangesets(self, root, changesets, applyable=None,
+    def applyUpstreamChangesets(self, root, module, changesets, applyable=None,
                                 replay=None, applied=None, logger=None,
                                 delayed_commit=False):
@@ -110 +110 @@
 
             if replay:
-                replay(root, c, delayed_commit=delayed_commit, logger=logger)
+                replay(root, module, c, delayed_commit=delayed_commit,
+                       logger=logger)
             
             if applied:

vcpx/target.py

@@ -49 +49 @@
     """
 
-    def replayChangeset(self, root, changeset,
+    def replayChangeset(self, root, module, changeset,
                         delayed_commit=False, logger=None):
         """
@@ -72 +72 @@
         else:
             from os.path import split
-
-            module = split(root)[1]
 
             remark = '%s: changeset %s' % (module, changeset.revision)
@@ -194 +192 @@
         raise "%s should override this method" % self.__class__
 
-    def initializeNewWorkingDir(self, root, repository, module, revision):
+    def initializeNewWorkingDir(self, root, repository, module, subdir, revision):
         """
         Initialize a new working directory, just extracted from
@@ -203 +201 @@
 
         now = datetime.now()
-        self._initializeWorkingDir(root, module)
+        self._initializeWorkingDir(root, repository, module, subdir)
         self._commit(root, now, '%s@%s' % (AUTHOR, HOST),
                      BOOTSTRAP_PATCHNAME % module,
                      BOOTSTRAP_CHANGELOG % locals(),
-                     entries=[module])
-
-    def _initializeWorkingDir(self, root, module, addentry=None):
+                     entries=[subdir])
+
+    def _initializeWorkingDir(self, root, repository, module, subdir, addentry=None):
         """
         Assuming the `root` directory contains a working copy `module`

vcpx/darcs.py

@@ -264 +264 @@
         c(old=oldentry, new=newentry)
 
-    def _initializeWorkingDir(self, root, module):
+    def _initializeWorkingDir(self, root, repository, module, subdir, addentry=None):
         """
         Execute `darcs initialize`.

vcpx/svn.py

@@ -352 +352 @@
         c(old=oldentry, new=newentry)
 
-    def _initializeWorkingDir(self, root, module, addentry=None):
+    def _initializeWorkingDir(self, root, repository, module, subdir, addentry=None):
         """
         Add the given directory to an already existing svn working tree.
@@ -362 +362 @@
             raise TargetInitializationFailure("'%s' needs to be an SVN working copy already be under SVN" % root)
 
-        SyncronizableTargetWorkingDir._initializeWorkingDir(self, root, module,
-                                                            SvnAdd)
+        SyncronizableTargetWorkingDir._initializeWorkingDir(self, root,
+                                                            repository, module,
+                                                            subdir, SvnAdd)

vcpx/dualwd.py

@@ -53 +53 @@
         return self.source.getUpstreamChangesets(root, sincerev)
     
-    def applyUpstreamChangesets(self, root, changesets, applyable=None,
+    def applyUpstreamChangesets(self, root, module, changesets, applyable=None,
                                 replay=None, applied=None, logger=None,
                                 delayed_commit=False):
-        return self.source.applyUpstreamChangesets(root, changesets,
+        return self.source.applyUpstreamChangesets(root, module, changesets,
                                                    replay=self.target.replayChangeset,
                                                    applyable=applyable,
@@ -71 +71 @@
     ## SyncronizableTargetWorkingDir
     
-    def initializeNewWorkingDir(self, root, repository, module, revision):
-        self.target.initializeNewWorkingDir(root, repository, module, revision)
+    def initializeNewWorkingDir(self, root, repository, module, subdir, revision):
+        self.target.initializeNewWorkingDir(root, repository, module, subdir, revision)
 
     def commitDelayedChangesets(self, root, concatenate_logs):

vcpx/tailor.py

@@ -283 +283 @@
 
         try:
-            dwd.initializeNewWorkingDir(self.root, repository, subdir, actual)
+            dwd.initializeNewWorkingDir(self.root, repository, module, subdir, actual)
         except:
             self.logger.exception('Working copy initialization failed!')
@@ -350 +350 @@
 
             try:
-                l,c = dwd.applyUpstreamChangesets(proj, changesets,
+                l,c = dwd.applyUpstreamChangesets(proj,self.module, changesets,
                                                   applyable=self.applyable,
                                                   applied=self.applied,