Commits

Greg Salt committed 19fddee Merge

Modified flow message strings

Comments (0)

Files changed (1)

         if (destin_with_trunk or destin_without_trunk) :
             # If either list is not empty.
             self._update( curr_workspace )
-            self._commit( close_branch = True, message = "%sClosed %s %s." % (self.msg_prefix, stream, name,), **kwarg )
+            self._commit( close_branch = True, message = "%sClosed branch %s." % (self.msg_prefix, name,), **kwarg )
         else :
             # If both lists are empty.
             if (stream == STREAM["support"]) :
             trunk = s.trunk()
             self._update( trunk          )
             self._merge ( curr_workspace )
-            self._commit( message = "%sMerged %s %s to %s ('%s')." % (self.msg_prefix, stream, name, s, trunk,), **kwarg )
+            self._commit( message = "%sMerged branch %s to %s ." % (self.msg_prefix, stream, name, s,), **kwarg )
             if (s == STREAM["master"]) :
                 self._tag( tag_name )
             elif (s in develop_stream and s is not develop_stream) :
                 config.write( fh )
             repo_status = self.repo.status( unknown = True )
             if (CONFIG_BASENAME in repo_status[0]) :
-                self._commit( config_fname, message = "flow initialization: Modified configuration file." )
+                self._commit( config_fname, message = "Modified configuration file." )
             elif (CONFIG_BASENAME in repo_status[4]) :
                 self._add   ( config_fname )
-                self._commit( config_fname, message = "flow initialization: Added configuration file." )
+                self._commit( config_fname, message = "Added configuration file." )
 
         write_config()
         
     
         # Creates 'master' and 'develop' streams if they don't yet exist.
         if (not self._find_branch( master_stream )) :
-            self._create_branch( master_stream, "flow initialization: Created <master> trunk: %s" % master_stream )
+            self._create_branch( master_stream, "Created <master> trunk: %s" % master_stream )
         if (not self._find_branch( develop_stream )) :
-            self._create_branch( develop_stream, "flow initialization: Created <develop> trunk: %s" % develop_stream )
+            self._create_branch( develop_stream, "Created <develop> trunk: %s" % develop_stream )
         self._update( workspace )
         self._unshelve()