Merge branch 'develop'

Author: WtfJoke

config.ini.sample

@@ -4,7 +4,9 @@ User=USR
 Password=secret
 GIT-Reponame = myGitRepo.git
 WorkspaceName=ToBeCreatedWorkspaceName
-## Will be created or emptied on initialization
+# If this value is set to True, the workspace referred with workspacename will just be loaded instead of newly created
+useExistingWorkspace = False
+# Folder to be created
 Directory = \temp\myWorkingDirectory
 
 [Migration]

configuration.py

@@ -6,13 +6,14 @@
 import shouter
 
 
-def readconfig():
+def read():
     config = configparser.ConfigParser()
     config.read("config.ini")
     generalsection = config['General']
     user = generalsection['User']
     password = generalsection['Password']
     workspace = generalsection['WorkspaceName']
+    useexistingworkspace = generalsection['useExistingWorkspace']
     repositoryurl = generalsection['Repo']
     workdirectory = generalsection['Directory']
     if not workdirectory:
@@ -31,7 +32,8 @@ def readconfig():
             baseline = componentbaseline[1].strip()
             initialcomponentbaselines.append(ComponentBaseLineEntry(component, baseline, component, baseline))
     gitreponame = generalsection['GIT-Reponame']
-    return ConfigObject(user, password, repositoryurl, workspace, workdirectory, initialcomponentbaselines, streamnames,
+    return ConfigObject(user, password, repositoryurl, workspace, useexistingworkspace, workdirectory,
+                        initialcomponentbaselines, streamnames,
                         gitreponame, oldeststream)
 
 
@@ -44,12 +46,14 @@ def getstreamnames(streamsfromconfig):
 
 
 class ConfigObject:
-    def __init__(self, user, password, repo, workspace, workdirectory, initialcomponentbaselines, streamnames,
+    def __init__(self, user, password, repo, workspace, useexistingworkspace, workdirectory, initialcomponentbaselines,
+                 streamnames,
                  gitreponame, oldeststream):
         self.user = user
         self.password = password
         self.repo = repo
         self.workspace = workspace
+        self.useexistingworkspace = useexistingworkspace is "True"
         self.workDirectory = workdirectory
         self.initialcomponentbaselines = initialcomponentbaselines
         self.streamnames = streamnames

gitFunctions.py

@@ -52,6 +52,7 @@ def addandcommit(changeentry):
             shouter.shout("30 Commits happend, push current branch to avoid out of memory")
             Commiter.pushbranch("")
             Commiter.commitcounter = 0
+        shouter.shout("Commited change in local git repository")
 
 
     @staticmethod
@@ -74,7 +75,7 @@ def replaceauthor(author, email):
     def branch(branchname):
         branchexist = shell.execute("git show-ref --verify --quiet refs/heads/" + branchname)
         if branchexist is 0:
-            shell.execute("git checkout " + branchname)
+            Commiter.checkout("git checkout " + branchname)
         else:
             shell.execute("git checkout -b " + branchname)
 
@@ -83,3 +84,7 @@ def pushbranch(branchname):
         if branchname:
             shouter.shout("Final push of branch " + branchname)
         shell.execute("git push origin " + branchname)
+
+    @staticmethod
+    def checkout(branchname):
+        shell.execute("git checkout " + branchname)

migration.py

@@ -1,5 +1,5 @@
 import os
-import shutil
+import sys
 
 from rtcFunctions import ImportHandler
 from rtcFunctions import WorkspaceHandler
@@ -13,7 +13,7 @@
 def initialize(config):
     directory = config.workDirectory
     if os.path.exists(directory):
-        shutil.rmtree(directory)
+        sys.exit("Configured directory already exists, please make sure to use a non-existing directory")
     os.mkdir(directory)
     os.chdir(directory)
     git = Initializer(config)
@@ -26,32 +26,38 @@ def resume(config):
     os.chdir(config.workDirectory)
     os.chdir(config.clonedGitRepoName)
     RTCInitializer.loginandcollectstreams(config)
+    WorkspaceHandler(config).load()
 
 
-def startmigration():
-    config = configuration.readconfig()
+def migrate():
+    config = configuration.read()
     rtc = ImportHandler(config)
     rtcworkspace = WorkspaceHandler(config)
     git = Commiter
 
     initialize(config)
     streamuuids = config.streamuuids
     for streamuuid in streamuuids:
+        componentbaselineentries = rtc.getcomponentbaselineentriesfromstream(streamuuid)
         streamname = config.streamnames[streamuuids.index(streamuuid)]
+        rtcworkspace.setnewflowtargets(streamuuid)
+
         git.branch(streamname)
-        componentbaselineentries = rtc.getcomponentbaselineentriesfromstream(streamuuid)
         rtc.acceptchangesintoworkspace(rtc.getchangeentriesofstreamcomponents(componentbaselineentries))
         shouter.shout("All changes of components of stream '%s' accepted" % streamname)
         git.pushbranch(streamname)
 
         rtcworkspace.setcomponentstobaseline(componentbaselineentries, streamuuid)
         rtcworkspace.load()
+
         rtc.acceptchangesintoworkspace(rtc.getchangeentriesofstream(streamuuid))
         git.pushbranch(streamname)
         shouter.shout("All changes of stream '%s' accepted - Migration of stream completed" % streamname)
 
         morestreamstomigrate = streamuuids.index(streamuuid) + 1 is not len(streamuuids)
         if morestreamstomigrate:
+            git.checkout("master")
             rtcworkspace.recreateoldestworkspace()
 
-startmigration()
+
+migrate()

rtcFunctions.py

@@ -9,7 +9,12 @@ class RTCInitializer:
     @staticmethod
     def initialize(config):
         RTCInitializer.loginandcollectstreams(config)
-        WorkspaceHandler(config).createandload(config.earlieststreamname, config.initialcomponentbaselines)
+        workspace = WorkspaceHandler(config)
+        if config.useexistingworkspace:
+            shouter.shout("Use existing workspace to start migration")
+            workspace.load()
+        else:
+            workspace.createandload(config.earlieststreamname, config.initialcomponentbaselines)
 
     @staticmethod
     def loginandcollectstreams(config):
@@ -39,7 +44,6 @@ def load(self):
         shouter.shout("Load of workspace finished")
 
     def setcomponentstobaseline(self, componentbaselineentries, streamuuid):
-        self.setnewflowtargets(streamuuid)
         for entry in componentbaselineentries:
             shouter.shout("Set component '%s' to baseline '%s'" % (entry.componentname, entry.baselinename))
 
@@ -48,19 +52,23 @@ def setcomponentstobaseline(self, componentbaselineentries, streamuuid):
             shell.execute(replacecommand)
 
     def setnewflowtargets(self, streamuuid):
-        shouter.shout("Replacing Flowtargets")
-        self.removedefaultflowtarget()
-        shell.execute("lscm add flowtarget -r %s %s %s"
-                      % (self.repo, self.workspace, streamuuid))
+        shouter.shout("Set new Flowtargets")
+        if not self.hasflowtarget(streamuuid):
+            shell.execute("lscm add flowtarget -r %s %s %s"
+                          % (self.repo, self.workspace, streamuuid))
         shell.execute("lscm set flowtarget -r %s %s --default --current %s"
                       % (self.repo, self.workspace, streamuuid))
 
-    def removedefaultflowtarget(self):
-        flowtargetline = shell.getoutput("lscm --show-alias n list flowtargets -r %s %s"
-                                         % (self.repo, self.workspace))[0]
-        flowtargetnametoremove = flowtargetline.split("\"")[1]
-        shell.execute("lscm remove flowtarget -r %s %s %s"
-                      % (self.repo, self.workspace, flowtargetnametoremove))
+    def hasflowtarget(self, streamuuid):
+        flowtargetlines = shell.getoutput("lscm --show-uuid y --show-alias n list flowtargets -r %s %s"
+                                          % (self.repo, self.workspace))
+        for flowtargetline in flowtargetlines:
+            splittedinformationline = flowtargetline.split("\"")
+            uuidpart = splittedinformationline[0].split(" ")
+            flowtargetuuid = uuidpart[0].strip()[1:-1]
+            if streamuuid in flowtargetuuid:
+                return True
+        return False
 
     def recreateoldestworkspace(self):
         self.createandload(self.config.earlieststreamname, self.config.initialcomponentbaselines, False)
@@ -121,12 +129,12 @@ def acceptchangesintoworkspace(self, changeentries):
             acceptcommand = "lscm accept --changes " + revision + " --overwrite-uncommitted"
             acceptedsuccesfully = shell.execute(acceptcommand, self.config.getlogpath("accept.txt"), "a") is 0
             if not acceptedsuccesfully:
+                shouter.shout("Last executed command: " + acceptcommand)
                 sys.exit("Change wasnt succesfully accepted into workspace, please check the output and "
                          "rerun programm with resume")
+            shouter.shout("Accepted change %s/%s into working directory" % (amountofacceptedchanges, amountofchanges))
             git.addandcommit(changeEntry)
 
-            shouter.shout("Accepted change %s/%s" % (amountofacceptedchanges, amountofchanges))
-
     def getchangeentriesofstreamcomponents(self, componentbaselineentries):
         shouter.shout("Start collecting changeentries")
         changeentries = []
@@ -168,6 +176,7 @@ def getchangeentriesbytypeandvalue(self, comparetype, value):
         shell.execute(comparecommand, outputfilename)
         return ImportHandler.getchangeentriesfromfile(outputfilename)
 
+
 class ChangeEntry:
     def __init__(self, revision, author, email, date, comment):
         self.revision = revision