Changeset 328 in tailor for vcpx/session.py

Timestamp:

05/25/05 01:47:10 (8 years ago)

Author:

lele@…

Hash name:

20050524234710-97f81-450081d4cdf715421d40b247679f5152a45df14c

Message:

State_file is mandatory for both bootstrap and update

File:

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

vcpx/session.py

@@ -62 +62 @@
         self.sub_directory = None
         
-        self.state_file = 'tailor.state'
+        self.state_file = None
         
         self.logfile = None
@@ -393 +393 @@
         from dualwd import DualWorkingDir
 
+        if not self.state_file:
+            self.__err('Need a state_file to proceed!\n')
+            return
+        
         if self.sub_directory:
             subdir = self.sub_directory
@@ -472 +476 @@
         from dualwd import DualWorkingDir
         from os.path import join
-        
+
+        if not self.state_file:
+            self.__err('Need a state_file to proceed!\n')
+            return
+                
         source_revision = self.readSourceRevision()
-        if source_revision:
-            repodir = join(self.current_directory, self.sub_directory)
-            dwd = DualWorkingDir(self.source_kind, self.target_kind)
-            changesets = dwd.getUpstreamChangesets(repodir,
-                                                   self.source_repository,
-                                                   self.source_module,
-                                                   source_revision)
-            nchanges = len(changesets)
-            if nchanges:
-                self.__log('Collected %d upstream changesets\n' % nchanges)
-
-                if arg:
-                    applyable = self.willApply
-                    try:
-                        howmany = min(int(arg), nchanges)
-                        changesets = changesets[:howmany]
-                        self.__log('Applying first %d of them\n' % howmany)
-                    except ValueError:
-                        if arg.lower() == 'ask':
-                            applyable = self.shouldApply
-
+        if not source_revision:
+            self.__err("Not yet bootstrapped!\n")
+            return
+        
+        repodir = join(self.current_directory, self.sub_directory)
+        dwd = DualWorkingDir(self.source_kind, self.target_kind)
+        changesets = dwd.getUpstreamChangesets(repodir,
+                                               self.source_repository,
+                                               self.source_module,
+                                               source_revision)
+        nchanges = len(changesets)
+        if nchanges:
+            self.__log('Collected %d upstream changesets\n' % nchanges)
+
+            if arg:
+                applyable = self.willApply
                 try:
-                    last, conflicts = dwd.applyUpstreamChangesets(
-                        repodir, self.source_module, changesets,
-                        applyable=applyable, applied=self.applied,
-                        logger=self.logger) # , delayed_commit=single_commit)
-                except:
-                    if self.logger:
-                        self.logger.exception('Upstream change application '
-                                              'failed')
-                    self.__err('Stopping after upstream change application '
-                               'failure.')
-                    return
-
-                if last:
-                    self.__log("Update completed, now at revision '%s'" %
-                               self.readSourceRevision())
-            else:
-                self.__log("Update completed with no upstream changes")
+                    howmany = min(int(arg), nchanges)
+                    changesets = changesets[:howmany]
+                    self.__log('Applying first %d of them\n' % howmany)
+                except ValueError:
+                    if arg.lower() == 'ask':
+                        applyable = self.shouldApply
+
+            try:
+                last, conflicts = dwd.applyUpstreamChangesets(
+                    repodir, self.source_module, changesets,
+                    applyable=applyable, applied=self.applied,
+                    logger=self.logger) # , delayed_commit=single_commit)
+            except:
+                if self.logger:
+                    self.logger.exception('Upstream change application '
+                                          'failed')
+                self.__err('Stopping after upstream change application '
+                           'failure.')
+                return
+
+            if last:
+                self.__log("Update completed, now at revision '%s'" %
+                           self.readSourceRevision())
         else:
-            self.__err("Not yet bootstrapped!\n")
+            self.__log("Update completed with no upstream changes")