Merge branch 'scm-version-config-option' of https://github.com/zevanty/rtc2git into zevanty-scm-version-config-option

Author: WtfJoke

config.ini.sample

@@ -13,6 +13,8 @@ ScmCommand = lscm
 # Optional - Set encoding of files (For example encoding = UTF-8)
 # See "https://github.com/rtcTo/rtc2git/wiki/Encoding" for further instructions
 encoding =
+# Optional - SCM version. Different SCM versions have different commands. If not specific, default is 5.
+ScmVersion = 5
 
 [Migration]
 # Stream to be migrated,  referenced by Name or UUID

configuration.py

@@ -34,6 +34,7 @@ def read(configname=None):
     scmcommand = generalsection.get('ScmCommand', "lscm")
     shell.logcommands = parsedconfig.get(miscsectionname, 'LogShellCommands', fallback="False") == "True"
     shell.setencoding(generalsection.get('encoding'))
+    scmversion = generalsection.get('ScmVersion', "5");
 
     workspace = shlex.quote(generalsection['WorkspaceName'])
     gitreponame = generalsection['GIT-Reponame']
@@ -56,7 +57,8 @@ def read(configname=None):
     gitattributesproperty = parsedconfig.get(migrationsectionname, 'Gitattributes', fallback='')
     gitattributes = parsesplittedproperty(gitattributesproperty)
 
-    configbuilder = Builder().setuser(user).setpassword(password).setstored(stored).setrepourl(repositoryurl).setscmcommand(scmcommand)
+    configbuilder = Builder().setuser(user).setpassword(password).setstored(stored).setrepourl(repositoryurl)
+    configbuilder.setscmcommand(scmcommand).setscmversion(scmversion)
     configbuilder.setworkspace(workspace).setgitreponame(gitreponame).setrootfolder(os.getcwd())
     configbuilder.setuseexistingworkspace(useexistingworkspace).setuseprovidedhistory(useprovidedhistory)
     configbuilder.setuseautomaticconflictresolution(useautomaticconflictresolution)
@@ -129,6 +131,7 @@ def __init__(self):
         self.stored = False
         self.repourl = ""
         self.scmcommand = "lscm"
+        self.scmversion = ""
         self.workspace = ""
         self.useexistingworkspace = ""
         self.useprovidedhistory = ""
@@ -169,6 +172,10 @@ def setscmcommand(self, scmcommand):
         self.scmcommand = scmcommand
         return self
 
+    def setscmversion(self, scmversion):
+        self.scmversion = int(scmversion)
+        return self
+
     def setworkspace(self, workspace):
         self.workspace = workspace
         return self
@@ -243,7 +250,7 @@ def isenabled(stringwithbooleanexpression):
         return stringwithbooleanexpression == "True"
 
     def build(self):
-        return ConfigObject(self.user, self.password, self.stored, self.repourl, self.scmcommand, self.workspace,
+        return ConfigObject(self.user, self.password, self.stored, self.repourl, self.scmcommand, self.scmversion, self.workspace,
                             self.useexistingworkspace, self.workdirectory, self.initialcomponentbaselines,
                             self.streamname, self.gitreponame, self.useprovidedhistory,
                             self.useautomaticconflictresolution, self.maxchangesetstoaccepttogether, self.clonedgitreponame, self.rootFolder,
@@ -252,7 +259,8 @@ def build(self):
 
 
 class ConfigObject:
-    def __init__(self, user, password, stored, repourl, scmcommand, workspace, useexistingworkspace, workdirectory,
+
+    def __init__(self, user, password, stored, repourl, scmcommand, scmversion, workspace, useexistingworkspace, workdirectory,
                  initialcomponentbaselines, streamname, gitreponame, useprovidedhistory,
                  useautomaticconflictresolution, maxchangesetstoaccepttogether, clonedgitreponame, rootfolder, previousstreamname,
                  ignorefileextensions, ignoredirectories, includecomponentroots, commitmessageprefix, gitattributes):
@@ -261,6 +269,7 @@ def __init__(self, user, password, stored, repourl, scmcommand, workspace, useex
         self.stored = stored
         self.repo = repourl
         self.scmcommand = scmcommand
+        self.scmversion = scmversion
         self.workspace = workspace
         self.useexistingworkspace = useexistingworkspace
         self.useprovidedhistory = useprovidedhistory

tests/resources/test_config.ini

@@ -8,6 +8,7 @@ Directory = /tmp/migration
 useExistingWorkspace = True
 ScmCommand = scm
 encoding = UTF-8
+ScmVersion = 6
 
 [Migration]
 StreamToMigrate = Superstream

tests/test_configuration.py

@@ -137,6 +137,7 @@ def _assertTestConfig(self, config, user=None, password=None):
         self.assertTrue(config.useexistingworkspace)
         self.assertEqual('scm', config.scmcommand)
         self.assertEqual('UTF-8', shell.encoding)  # directly deviated to shell
+        self.assertEqual(6, config.scmversion)
         # [Migration]
         self.assertEqual('Superstream', config.streamname)
         self.assertEqual('Previousstream', config.previousstreamname)
@@ -181,6 +182,7 @@ def _assertDefaultConfig(self, config):
         self.assertFalse(config.useexistingworkspace)
         self.assertEqual('lscm', config.scmcommand)
         self.assertEqual(None, shell.encoding)  # directly deviated to shell
+        self.assertEqual(5, config.scmversion)
         # [Migration]
         self.assertEqual('Ministream', config.streamname)
         self.assertEqual('', config.previousstreamname)