Changeset 325 in tailor

Timestamp:

05/24/05 11:06:24 (8 years ago)

Author:

lele@…

Hash name:

20050524090624-97f81-7c42a92db1909678b103257ed8fd59d9a5ae760e

Message:

Little fixes

File:

• vcpx/session.py (modified) (6 diffs)

vcpx/session.py

@@ -64 +64 @@
         self.state_file = 'tailor.state'
         
-        self.changesets = None
         self.logfile = None
         self.logger = None
@@ -426 +425 @@
                                         self.sub_directory,
                                         actual)
-        except:
+        except Exception, exc:
             self.__err('Working copy initialization failed: %s, %s' % (exc.__doc__, exc))
             if self.logger:
@@ -471 +470 @@
         """
 
+        from dualwd import DualWorkingDir
+        from os.path import join
+        
         source_revision = self.readSourceRevision()
-        if self.source_kind and \
-           self.source_repository and \
-           self.source_module and \
-           source_revision:
-
+        if source_revision:
+            repodir = join(self.current_directory, self.sub_directory)
             dwd = DualWorkingDir(self.source_kind, self.target_kind)
-            self.changesets = dwd.getUpstreamChangesets(self.current_directory,
-                                                        self.source_repository,
-                                                        self.source_module,
-                                                        source_revision)
+            changesets = dwd.getUpstreamChangesets(repodir,
+                                                   self.source_repository,
+                                                   self.source_module,
+                                                   source_revision)
             nchanges = len(changesets)
             if nchanges:
@@ -487 +486 @@
 
                 if arg:
-                    appliable = self.willApply
+                    applyable = self.willApply
                     try:
                         howmany = min(int(arg), nchanges)
@@ -494 +493 @@
                     except ValueError:
                         if arg.lower() == 'ask':
-                            appliable = self.shouldApply
+                            applyable = self.shouldApply
 
                 try:
                     last, conflicts = dwd.applyUpstreamChangesets(
-                        proj, self.module, changesets, applyable=applyable,
-                        applied=self.applied, logger=self.logger,
-                        delayed_commit=single_commit)
+                        repodir, self.source_module, changesets,
+                        applyable=applyable, applied=self.applied,
+                        logger=self.logger) # , delayed_commit=single_commit)
                 except:
                     if self.logger:
@@ -515 +514 @@
                 self.__log("Update completed with no upstream changes")
         else:
-            self.__err("needs 'source_kind', 'source_repository' and "
-                       "'source_module' to proceed.\n")
+            self.__err("Not yet bootstrapped!\n")