Mercurial Repositories > eric / file diff

--- a/VCS/ProjectHelper.py	Wed Aug 17 12:32:58 2016 +0200
+++ b/VCS/ProjectHelper.py	Wed Aug 17 17:52:52 2016 +0200
@@ -203,13 +203,13 @@
         if not self.project.closeProject():
             return
         
-        self.project.pdata["VCS"] = [vcsSystem]
+        self.project.pdata["VCS"] = vcsSystem
         self.project.vcs = self.project.initVCS(vcsSystem)
         if self.project.vcs is not None:
             vcsdlg = self.project.vcs.vcsNewProjectOptionsDialog()
             if vcsdlg.exec_() == QDialog.Accepted:
                 projectdir, vcsDataDict = vcsdlg.getData()
-                self.project.pdata["VCS"] = [vcsSystem]
+                self.project.pdata["VCS"] = vcsSystem
                 self.project.vcs = self.project.initVCS(vcsSystem)
                 # edit VCS command options
                 if self.project.vcs.vcsSupportCommandOptions():
@@ -238,7 +238,7 @@
                             self.tr(
                                 "<p>The project directory <b>{0}</b> could not"
                                 " be created.</p>").format(projectdir))
-                        self.project.pdata["VCS"] = ['None']
+                        self.project.pdata["VCS"] = 'None'
                         self.project.vcs = self.project.initVCS()
                         return
                 
@@ -271,7 +271,7 @@
                                     QFileInfo(d, pfilename).absoluteFilePath())
                                 self.project.newProject.emit()
                         if export:
-                            self.project.pdata["VCS"] = ['None']
+                            self.project.pdata["VCS"] = 'None'
                             self.project.vcs = self.project.initVCS()
                             self.project.setDirty(True)
                             self.project.saveProject()
@@ -298,7 +298,7 @@
                                 try:
                                     ms = os.path.join(
                                         self.project.ppath,
-                                        self.project.pdata["MAINSCRIPT"][0])
+                                        self.project.pdata["MAINSCRIPT"])
                                     if os.path.exists(ms):
                                         self.project.appendFile(ms)
                                 except IndexError:
@@ -326,10 +326,10 @@
                         self.tr(
                             """The project could not be retrieved from"""
                             """ the repository."""))
-                    self.project.pdata["VCS"] = ['None']
+                    self.project.pdata["VCS"] = 'None'
                     self.project.vcs = self.project.initVCS()
             else:
-                self.project.pdata["VCS"] = ['None']
+                self.project.pdata["VCS"] = 'None'
                 self.project.vcs = self.project.initVCS()
 
     def _vcsExport(self):
@@ -351,7 +351,7 @@
             """
             Local function to revert the changes made to the project object.
             """
-            self.project.pdata["VCS"] = pdata_vcs[:]
+            self.project.pdata["VCS"] = pdata_vcs
             self.project.pdata["VCSOPTIONS"] = copy.deepcopy(pdata_vcsoptions)
             self.project.pdata["VCSOTHERDATA"] = copy.deepcopy(pdata_vcsother)
             self.project.vcs = vcs
@@ -361,7 +361,7 @@
             self.project.setDirty(True)
             self.project.saveProject()
         
-        pdata_vcs = self.project.pdata["VCS"][:]
+        pdata_vcs = self.project.pdata["VCS"]
         pdata_vcsoptions = copy.deepcopy(self.project.pdata["VCSOPTIONS"])
         pdata_vcsother = copy.deepcopy(self.project.pdata["VCSOTHERDATA"])
         vcs = self.project.vcs
@@ -388,7 +388,7 @@
             if vcsSystemDisplay == vcsSelected:
                 break
         
-        self.project.pdata["VCS"] = [vcsSystem]
+        self.project.pdata["VCS"] = vcsSystem
         self.project.vcs = self.project.initVCS(vcsSystem)
         if self.project.vcs is not None:
             vcsdlg = self.project.vcs.vcsOptionsDialog(self.project,