eric: comparison Plugins/VcsPlugins/vcsPySvn/subversion.py

-:9986ec0e559a
+:10516539f238
 ]
 self.commandHistory = []
 self.wdHistory = []
-if pysvn.version >= (1, 4, 3, 0) and "SVN_ASP_DOT_NET_HACK" in os.environ:
+if pysvn.version >= (1, 4, 3, 0) and \
+"SVN_ASP_DOT_NET_HACK" in os.environ:
 self.adminDir = '_svn'
 else:
 self.adminDir = '.svn'
 self.log = None
 self.statusCache = {}
 self.__commitData = {}
 self.__commitDialog = None
-self.__wcng = True      # assume new generation working copy metadata format
+self.__wcng = True      # assume new generation working copy
+# metadata format
 def getPlugin(self):
 """
 Public method to get a reference to the plugin object.
 client.exception_style = 1
 client.set_auth_cache(authCache)
 return client
-############################################################################
+###########################################################################
 ## Methods of the VCS interface
-############################################################################
+###########################################################################
 def vcsShutdown(self):
 """
 Public method used to shutdown the Subversion interface.
 """
 def vcsExists(self):
 """
 Public method used to test for the presence of the svn executable.
-@return flag indicating the existance (boolean) and an error message (string)
+@return flag indicating the existance (boolean) and an error message
+(string)
 """
 self.versionStr = ".".join([str(v) for v in pysvn.svn_version[:-1]])
 self.version = pysvn.svn_version[:-1]
 return True, ""
 """
 return True
 def vcsConvertProject(self, vcsDataDict, project):
 """
-Public method to convert an uncontrolled project to a version controlled project.
+Public method to convert an uncontrolled project to a version
+controlled project.
 @param vcsDataDict dictionary of data required for the conversion
 @param project reference to the project object
 """
 success = self.vcsImport(vcsDataDict, project.ppath)[0]
 if not success:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Create project in repository"),
-self.trUtf8("""The project could not be created in the repository."""
+self.trUtf8(
-""" Maybe the given repository doesn't exist or the"""
+"""The project could not be created in the repository."""
-""" repository server is down."""))
+""" Maybe the given repository doesn't exist or the"""
+""" repository server is down."""))
 else:
 cwdIsPpath = False
 if os.getcwd() == project.ppath:
 os.chdir(os.path.dirname(project.ppath))
 cwdIsPpath = True
 if not os.path.isfile(pfn):
 pfn += "z"
 if not os.path.isfile(pfn):
 E5MessageBox.critical(self.__ui,
 self.trUtf8("New project"),
-self.trUtf8("""The project could not be checked out of the"""
+self.trUtf8(
-""" repository.<br />"""
+"""The project could not be checked out of the"""
-"""Restoring the original contents."""))
+""" repository.<br />"""
+"""Restoring the original contents."""))
 if os.getcwd() == project.ppath:
 os.chdir(os.path.dirname(project.ppath))
 cwdIsPpath = True
 else:
 cwdIsPpath = False
 project.closeProject(noSave=True)
 project.openProject(pfn)
 def vcsImport(self, vcsDataDict, projectDir, noDialog=False):
 """
-Public method used to import the project into the Subversion repository.
+Public method used to import the project into the Subversion
+repository.
 @param vcsDataDict dictionary of data required for the import
 @param projectDir project directory (string)
 @param noDialog flag indicating quiet operations
 @return flag indicating an execution without errors (boolean)
 os.makedirs(tmpDir)
 if self.otherData["standardLayout"]:
 os.mkdir(os.path.join(tmpDir, project))
 os.mkdir(os.path.join(tmpDir, project, 'branches'))
 os.mkdir(os.path.join(tmpDir, project, 'tags'))
-shutil.copytree(projectDir, os.path.join(tmpDir, project, 'trunk'))
+shutil.copytree(
+projectDir, os.path.join(tmpDir, project, 'trunk'))
 else:
 shutil.copytree(projectDir, os.path.join(tmpDir, project))
 except OSError as e:
 if os.path.isdir(tmpDir):
 shutil.rmtree(tmpDir, True)
 opts = self.options['global']
 recurse = "--non-recursive" not in opts
 url = self.__svnURL(vcsDir)
 client = self.getClient()
 if not noDialog:
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.trUtf8('Importing project into Subversion repository'),
+self.trUtf8('Importing project into Subversion repository'),
 "import{0} --message {1} .".format(
-(not recurse) and " --non-recursive" or "",
+(not recurse) and " --non-recursive" or "", msg),
-msg),
+client)
-client)
 QApplication.processEvents()
 try:
 rev = client.import_(".", url, msg, recurse, ignore=True)
 status = True
 except pysvn.ClientError as e:
 shutil.rmtree(tmpDir, True)
 return status, False
 def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False):
 """
-Public method used to check the project out of the Subversion repository.
+Public method used to check the project out of the Subversion
+repository.
 @param vcsDataDict dictionary of data required for the checkout
 @param projectDir project directory to create (string)
 @param noDialog flag indicating quiet operations
 @return flag indicating an execution without errors (boolean)
 if self.otherData["standardLayout"]:
 if tag is None or tag == '':
 svnUrl = '{0}/trunk'.format(vcsDir)
 else:
-if not tag.startswith('tags') and not tag.startswith('branches'):
+if not tag.startswith('tags') and \
+not tag.startswith('branches'):
 type_, ok = QInputDialog.getItem(
 None,
 self.trUtf8("Subversion Checkout"),
 self.trUtf8("The tag must be a normal tag (tags) or"
 " a branch tag (branches)."
 opts = self.options['global'] + self.options['checkout']
 recurse = "--non-recursive" not in opts
 url = self.__svnURL(svnUrl)
 client = self.getClient()
 if not noDialog:
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.trUtf8('Checking project out of Subversion repository'),
+self.trUtf8('Checking project out of Subversion repository'),
 "checkout{0} {1} {2}".format(
 (not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.checkout(url, projectDir, recurse)
 status = True
 dlg.exec_()
 return status
 def vcsExport(self, vcsDataDict, projectDir):
 """
-Public method used to export a directory from the Subversion repository.
+Public method used to export a directory from the Subversion
+repository.
 @param vcsDataDict dictionary of data required for the checkout
 @param projectDir project directory to create (string)
 @return flag indicating an execution without errors (boolean)
 """
 if self.otherData["standardLayout"]:
 if tag is None or tag == '':
 svnUrl = '{0}/trunk'.format(vcsDir)
 else:
-if not tag.startswith('tags') and not tag.startswith('branches'):
+if not tag.startswith('tags') and \
+not tag.startswith('branches'):
 type_, ok = QInputDialog.getItem(
 None,
 self.trUtf8("Subversion Export"),
 self.trUtf8("The tag must be a normal tag (tags) or"
 " a branch tag (branches)."
 opts = self.options['global']
 recurse = "--non-recursive" not in opts
 url = self.__svnURL(svnUrl)
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.trUtf8('Exporting project from Subversion repository'),
+self.trUtf8('Exporting project from Subversion repository'),
 "export --force{0} {1} {2}".format(
 (not recurse) and " --non-recursive" or "",
 url, projectDir),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.export(url, projectDir, force=True, recurse=recurse)
 status = True
 dlg.exec_()
 return status
 def vcsCommit(self, name, message, noDialog=False):
 """
-Public method used to make the change of a file/directory permanent in the
+Public method used to make the change of a file/directory permanent
-Subversion repository.
+in the Subversion repository.
-@param name file/directory name to be committed (string or list of strings)
+@param name file/directory name to be committed (string or
+list of strings)
 @param message message for this operation (string)
 @param noDialog flag indicating quiet operations
 """
 if not noDialog and not message:
 # call CommitDialog and get message from there
 if self.__commitDialog is None:
 from .SvnCommitDialog import SvnCommitDialog
-self.__commitDialog = SvnCommitDialog(self.svnGetChangelists(), self.__ui)
+self.__commitDialog = SvnCommitDialog(
+self.svnGetChangelists(), self.__ui)
 self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
 self.__commitDialog.show()
 self.__commitDialog.raise_()
 self.__commitDialog.activateWindow()
 for nam in nameList:
 # check for commit of the project
 if os.path.isdir(nam):
 project = e5App().getObject("Project")
 if nam == project.getProjectPath():
-ok &= project.checkAllScriptsDirty(reportSyntaxErrors=True) and \
+ok &= project.checkAllScriptsDirty(
+reportSyntaxErrors=True) and \
 project.checkDirty()
 continue
 elif os.path.isfile(nam):
-editor = e5App().getObject("ViewManager").getOpenEditor(nam)
+editor = e5App().getObject("ViewManager")\
+.getOpenEditor(nam)
 if editor:
 ok &= editor.checkDirty()
 if not ok:
 break
 if not ok:
 res = E5MessageBox.yesNo(self.__ui,
 self.trUtf8("Commit Changes"),
-self.trUtf8("""The commit affects files, that have unsaved"""
+self.trUtf8(
-""" changes. Shall the commit be continued?"""),
+"""The commit affects files, that have unsaved"""
+""" changes. Shall the commit be continued?"""),
 icon=E5MessageBox.Warning)
 if not res:
 return
 if self.__commitDialog is not None:
 msg = self.__commitDialog.logMessage()
 if self.__commitDialog.hasChangelists():
-changelists, keepChangelists = self.__commitDialog.changelistsData()
+changelists, keepChangelists = \
+self.__commitDialog.changelistsData()
 else:
 changelists, keepChangelists = [], False
-##            self.__commitDialog.accepted.disconnect(self.__vcsCommit_Step2)
 self.__commitDialog.deleteLater()
 self.__commitDialog = None
 else:
 changelists, keepChangelists = [], False
 opts = self.options['global'] + self.options['commit']
 recurse = "--non-recursive" not in opts
 keeplocks = "--keep-locks" in opts
 client = self.getClient()
 if not noDialog:
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.trUtf8('Commiting changes to Subversion repository'),
+self.trUtf8('Commiting changes to Subversion repository'),
 "commit{0}{1}{2}{3} --message {4} {5}".format(
 (not recurse) and " --non-recursive" or "",
 keeplocks and " --keep-locks" or "",
 keepChangelists and " --keep-changelists" or "",
 changelists and \
 " --changelist ".join([""] + changelists) or "",
 msg, " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 if changelists:
 rev = client.checkin(fnames, msg,
 recurse=recurse, keep_locks=keeplocks,
 self.committed.emit()
 self.checkVCSStatus()
 def vcsUpdate(self, name, noDialog=False):
 """
-Public method used to update a file/directory with the Subversion repository.
+Public method used to update a file/directory with the Subversion
+repository.
-@param name file/directory name to be updated (string or list of strings)
+@param name file/directory name to be updated (string or list of
+strings)
 @param noDialog flag indicating quiet operations (boolean)
 @return flag indicating, that the update contained an add
 or delete (boolean)
 """
 if isinstance(name, list):
 os.chdir(dname)
 opts = self.options['global'] + self.options['update']
 recurse = "--non-recursive" not in opts
 client = self.getClient()
 if not noDialog:
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.trUtf8('Synchronizing with the Subversion repository'),
+self.trUtf8('Synchronizing with the Subversion repository'),
 "update{0} {1}".format(
 (not recurse) and " --non-recursive" or "",
 " ".join(fnames)),
 client)
 QApplication.processEvents()
 try:
 client.update(fnames, recurse)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 self.checkVCSStatus()
 return res
 def vcsAdd(self, name, isDir=False, noDialog=False):
 """
-Public method used to add a file/directory to the Subversion repository.
+Public method used to add a file/directory to the Subversion
+repository.
 @param name file/directory name to be added (string)
 @param isDir flag indicating name is a directory (boolean)
 @param noDialog flag indicating quiet operations (boolean)
 """
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
 while os.path.normcase(dname) != os.path.normcase(repodir) and \
 (os.path.normcase(dname) not in self.statusCache or \
-self.statusCache[os.path.normcase(dname)] == self.canBeAdded):
+self.statusCache[os.path.normcase(dname)] ==
-# add directories recursively, if they aren't in the repository already
+self.canBeAdded):
+# add directories recursively, if they aren't in the
+# repository already
 tree.insert(-1, dname)
 dname = os.path.dirname(dname)
 wdir = dname
 else:
 while not os.path.exists(os.path.join(dname, self.adminDir)):
-# add directories recursively, if they aren't in the repository already
+# add directories recursively, if they aren't in the
+# repository already
 tree.insert(-1, dname)
 dname = os.path.dirname(dname)
 wdir = dname
 names.extend(tree)
 tree2 = []
 for n in name:
 d = os.path.dirname(n)
 if self.__wcng:
 repodir = d
-while not os.path.isdir(os.path.join(repodir, self.adminDir)):
+while not os.path.isdir(
+os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
-while os.path.normcase(d) != os.path.normcase(repodir) and \
+while os.path.normcase(d) != \
+os.path.normcase(repodir) and \
 (d not in tree2 + tree) and \
 (os.path.normcase(d) not in self.statusCache or \
-self.statusCache[os.path.normcase(d)] == self.canBeAdded):
+self.statusCache[os.path.normcase(d)] ==
+self.canBeAdded):
 tree2.append(d)
 d = os.path.dirname(d)
 else:
 while not os.path.exists(os.path.join(d, self.adminDir)):
 if d in tree2 + tree:
 recurse = False
 force = "--force" in opts or noDialog
 noignore = "--no-ignore" in opts
 client = self.getClient()
 if not noDialog:
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.trUtf8('Adding files/directories to the Subversion'
-self.trUtf8('Adding files/directories to the Subversion repository'),
+' repository'),
 "add --non-recursive{0}{1} {2}".format(
 force and " --force" or "",
 noignore and " --no-ignore" or "",
 " ".join(names)),
 client)
 QApplication.processEvents()
 try:
-client.add(names, recurse=recurse, force=force, ignore=not noignore)
+client.add(names, recurse=recurse, force=force,
+ignore=not noignore)
 except pysvn.ClientError as e:
 if not noDialog:
 dlg.showError(e.args[0])
 locker.unlock()
 if not noDialog:
 """
 self.vcsAdd(name, isDir)
 def vcsAddTree(self, path):
 """
-Public method to add a directory tree rooted at path to the Subversion repository.
+Public method to add a directory tree rooted at path to the Subversion
+repository.
-@param path root directory of the tree to be added (string or list of strings))
+@param path root directory of the tree to be added (string or list of
+strings))
 """
 tree = []
 if isinstance(path, list):
 dname, fnames = self.splitPathList(path)
 for n in path:
 d = os.path.dirname(n)
 if self.__wcng:
 repodir = d
-while not os.path.isdir(os.path.join(repodir, self.adminDir)):
+while not os.path.isdir(
+os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
-while os.path.normcase(d) != os.path.normcase(repodir) and \
+while os.path.normcase(d) != \
+os.path.normcase(repodir) and \
 (d not in tree) and \
 (os.path.normcase(d) not in self.statusCache or \
-self.statusCache[os.path.normcase(d)] == self.canBeAdded):
+self.statusCache[os.path.normcase(d)] ==
+self.canBeAdded):
 tree.append(d)
 d = os.path.dirname(d)
 else:
 while not os.path.exists(os.path.join(d, self.adminDir)):
 # add directories recursively,
 repodir = dname
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return  # oops, project is not version controlled
-while os.path.normcase(dname) != os.path.normcase(repodir) and \
+while os.path.normcase(dname) != \
+os.path.normcase(repodir) and \
 (os.path.normcase(dname) not in self.statusCache or \
-self.statusCache[os.path.normcase(dname)] == self.canBeAdded):
+self.statusCache[os.path.normcase(dname)] ==
-# add directories recursively, if they aren't in the repository already
+self.canBeAdded):
+# add directories recursively, if they aren't in the
+# repository already
 tree.insert(-1, dname)
 dname = os.path.dirname(dname)
 else:
 while not os.path.exists(os.path.join(dname, self.adminDir)):
 # add directories recursively,
 opts = self.options['global'] + self.options['add']
 recurse = True
 force = "--force" in opts
 ignore = "--ignore" in opts
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.trUtf8('Adding directory trees to the Subversion repository'),
-self.trUtf8('Adding directory trees to the Subversion repository'),
+"add{0}{1} {2}".format(
-"add{0}{1} {2}".format(
+force and " --force" or "",
-force and " --force" or "",
+ignore and " --ignore" or "",
-ignore and " --ignore" or "",
+" ".join(names)),
-" ".join(names)),
+client)
-client)
 QApplication.processEvents()
 try:
 client.add(names, recurse=recurse, force=force, ignore=ignore)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 dlg.exec_()
 os.chdir(cwd)
 def vcsRemove(self, name, project=False, noDialog=False):
 """
-Public method used to remove a file/directory from the Subversion repository.
+Public method used to remove a file/directory from the Subversion
+repository.
 The default operation is to remove the local copy as well.
-@param name file/directory name to be removed (string or list of strings))
+@param name file/directory name to be removed (string or list of
-@param project flag indicating deletion of a project tree (boolean) (not needed)
+strings))
+@param project flag indicating deletion of a project tree (boolean)
+(not needed)
 @param noDialog flag indicating quiet operations
 @return flag indicating successfull operation (boolean)
 """
 if not isinstance(name, list):
 name = [name]
 opts = self.options['global'] + self.options['remove']
 force = "--force" in opts or noDialog
 client = self.getClient()
 if not noDialog:
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.trUtf8('Removing files/directories from the Subversion'
-self.trUtf8('Removing files/directories from the Subversion repository'),
+' repository'),
 "remove{0} {1}".format(
 force and " --force" or "",
 " ".join(name)),
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.remove(name, force=force)
 res = True
 """
 Public method used to view the difference of a file/directory to the
 Subversion repository.
 If name is a directory and is the project directory, all project files
-are saved first. If name is a file (or list of files), which is/are being edited
+are saved first. If name is a file (or list of files), which is/are
-and has unsaved modification, they can be saved or the operation may be aborted.
+being edited and has unsaved modification, they can be saved or the
+operation may be aborted.
 @param name file/directory name to be diffed (string)
 """
 if isinstance(name, list):
 names = name[:]
 reposURL = self.svnGetReposName(dname)
 if reposURL is None:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Subversion Error"),
-self.trUtf8("""The URL of the project repository could not be"""
+self.trUtf8(
-""" retrieved from the working copy. The tag operation will"""
+"""The URL of the project repository could not be"""
-""" be aborted"""))
+""" retrieved from the working copy. The tag operation"""
+""" will be aborted"""))
 return
 if self.otherData["standardLayout"]:
 url = None
 else:
 reposRoot = rx_base.cap(1)
 if tagOp in [1, 4]:
 url = '{0}/tags/{1}'.format(reposRoot, urllib.parse.quote(tag))
 elif tagOp in [2, 8]:
-url = '{0}/branches/{1}'.format(reposRoot, urllib.parse.quote(tag))
+url = '{0}/branches/{1}'.format(
+reposRoot, urllib.parse.quote(tag))
 else:
 url = self.__svnURL(tag)
 self.tagName = tag
 client = self.getClient()
 rev = None
 if tagOp in [1, 2]:
 log = 'Created tag <{0}>'.format(self.tagName)
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.trUtf8('Tagging {0} in the Subversion repository')
-self.trUtf8('Tagging {0} in the Subversion repository').format(name),
+.format(name),
 "copy --message {0} {1} {2}".format(log, reposURL, url),
 client, log=log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 rev = client.copy(reposURL, url)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 else:
 log = 'Deleted tag <{0}>'.format(self.tagName)
-dlg = \
+dlg = SvnDialog(
-SvnDialog(
+self.trUtf8('Tagging {0} in the Subversion repository')
-self.trUtf8('Tagging {0} in the Subversion repository').format(name),
+.format(name),
 "remove --message {0} {1}".format(log, url),
 client, log=log)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 rev = client.remove(url)
 except pysvn.ClientError as e:
 recurse = True
 project = e5App().getObject("Project")
 names = [project.getRelativePath(nam) for nam in name]
 if names[0]:
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
+from UI.DeleteFilesConfirmationDialog import \
+DeleteFilesConfirmationDialog
 dia = DeleteFilesConfirmationDialog(self.parent(),
 self.trUtf8("Revert changes"),
-self.trUtf8("Do you really want to revert all changes to these files"
+self.trUtf8(
-" or directories?"),
+"Do you really want to revert all changes to these files"
+" or directories?"),
 name)
 yes = dia.exec_() == QDialog.Accepted
 else:
 yes = E5MessageBox.yesNo(None,
 self.trUtf8("Revert changes"),
 self.trUtf8("""Do you really want to revert all changes of"""
 """ the project?"""))
 if yes:
 client = self.getClient()
-dlg = \
+dlg = SvnDialog(
-SvnDialog(self.trUtf8('Reverting changes'),
+self.trUtf8('Reverting changes'),
-"revert {0} {1}".format((not recurse) and " --non-recursive" or "",
+"revert {0} {1}".format(
-" ".join(name)),
+(not recurse) and " --non-recursive" or "",
-client)
+" ".join(name)),
+client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 client.revert(name, recurse)
 except pysvn.ClientError as e:
 reposURL = self.svnGetReposName(dname)
 if reposURL is None:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Subversion Error"),
-self.trUtf8("""The URL of the project repository could not be"""
+self.trUtf8(
-""" retrieved from the working copy. The switch operation will"""
+"""The URL of the project repository could not be"""
-""" be aborted"""))
+""" retrieved from the working copy. The switch"""
+""" operation will be aborted"""))
 return False
 if self.otherData["standardLayout"]:
 url = None
 else:
 reposRoot = rx_base.cap(1)
 tn = tag
 if tagType == 1:
 url = '{0}/tags/{1}'.format(reposRoot, urllib.parse.quote(tag))
 elif tagType == 2:
-url = '{0}/branches/{1}'.format(reposRoot, urllib.parse.quote(tag))
+url = '{0}/branches/{1}'.format(
+reposRoot, urllib.parse.quote(tag))
 elif tagType == 4:
 url = '{0}/trunk'.format(reposRoot)
 tn = 'HEAD'
 else:
 url = self.__svnURL(tag)
 """
 dname, fname = self.splitPath(name)
 opts = self.options['global']
 from .SvnMergeDialog import SvnMergeDialog
-dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2],
+dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1],
-"--force" in opts)
+self.mergeList[2], "--force" in opts)
 if dlg.exec_() == QDialog.Accepted:
 urlrev1, urlrev2, target, force = dlg.getParameters()
 else:
 return
 if rx_rev.exactMatch(urlrev1):
 if urlrev1 in ["HEAD", "head"]:
 revision1 = pysvn.Revision(pysvn.opt_revision_kind.head)
 rev1 = "HEAD"
 else:
-revision1 = \
+revision1 = pysvn.Revision(
-pysvn.Revision(pysvn.opt_revision_kind.number, int(urlrev1))
+pysvn.opt_revision_kind.number, int(urlrev1))
 rev1 = urlrev1
 if urlrev2 in ["HEAD", "head"]:
 revision2 = pysvn.Revision(pysvn.opt_revision_kind.head)
 rev2 = "HEAD"
 else:
-revision2 = \
+revision2 = pysvn.Revision(
-pysvn.Revision(pysvn.opt_revision_kind.number, int(urlrev2))
+pysvn.opt_revision_kind.number, int(urlrev2))
 rev2 = urlrev2
 if not target:
 url1 = name
 url2 = name
 else:
 url1, rev = urlrev1.split("@")
 if rev in ["HEAD", "head"]:
 revision1 = pysvn.Revision(pysvn.opt_revision_kind.head)
 rev1 = "HEAD"
 else:
-revision1 = \
+revision1 = pysvn.Revision(
-pysvn.Revision(pysvn.opt_revision_kind.number, int(rev))
+pysvn.opt_revision_kind.number, int(rev))
 rev1 = rev
 else:
 url1 = urlrev1
 revision1 = pysvn.Revision(pysvn.opt_revision_kind.unspecified)
 rev1 = ""
 url2, rev = urlrev2.split("@")
 if rev in ["HEAD", "head"]:
 revision2 = pysvn.Revision(pysvn.opt_revision_kind.head)
 rev2 = "HEAD"
 else:
-revision2 = \
+revision2 = pysvn.Revision(
-pysvn.Revision(pysvn.opt_revision_kind.number, int(rev))
+pysvn.opt_revision_kind.number, int(rev))
 rev2 = rev
 else:
 url2 = urlrev2
 revision2 = pysvn.Revision(pysvn.opt_revision_kind.unspecified)
 rev2 = ""
 def __vcsRegisteredState_wcng(self, name):
 """
 Private method used to get the registered state of a file in the vcs.
-This is the variant for subversion installations using the new working copy
+This is the variant for subversion installations using the new
-meta-data format.
+working copy meta-data format.
 @param name filename to check (string)
 @return a combination of canBeCommited and canBeAdded
 """
 if name.endswith(os.sep):
 def __vcsRegisteredState_wc(self, name):
 """
 Private method used to get the registered state of a file in the vcs.
-This is the variant for subversion installations using the old working copy
+This is the variant for subversion installations using the old working
-meta-data format.
+copy meta-data format.
 @param name filename to check (string)
 @return a combination of canBeCommited and canBeAdded
 """
 dname, fname = self.splitPath(name)
 else:
 return self.canBeAdded
 def vcsAllRegisteredStates(self, names, dname, shortcut=True):
 """
-Public method used to get the registered states of a number of files in the vcs.
+Public method used to get the registered states of a number of files
+in the vcs.
-<b>Note:</b> If a shortcut is to be taken, the code will only check, if the named
-directory has been scanned already. If so, it is assumed, that the states for
+<b>Note:</b> If a shortcut is to be taken, the code will only check,
-all files has been populated by the previous run.
+if the named directory has been scanned already. If so, it is assumed,
+that the states for all files has been populated by the previous run.
 @param names dictionary with all filenames to be checked as keys
 @param dname directory to check in (string)
 @param shortcut flag indicating a shortcut should be taken (boolean)
 @return the received dictionary completed with a combination of
 else:
 return self.__vcsAllRegisteredStates_wc(names, dname, shortcut)
 def __vcsAllRegisteredStates_wcng(self, names, dname, shortcut=True):
 """
-Private method used to get the registered states of a number of files in the vcs.
+Private method used to get the registered states of a number of files
+in the vcs.
-This is the variant for subversion installations using the new working copy
-meta-data format.
+This is the variant for subversion installations using the new working
+copy meta-data format.
-<b>Note:</b> If a shortcut is to be taken, the code will only check, if the named
-directory has been scanned already. If so, it is assumed, that the states for
+<b>Note:</b> If a shortcut is to be taken, the code will only check,
-all files has been populated by the previous run.
+if the named directory has been scanned already. If so, it is assumed,
+that the states for all files has been populated by the previous run.
 @param names dictionary with all filenames to be checked as keys
 @param dname directory to check in (string)
 @param shortcut flag indicating a shortcut should be taken (boolean)
 @return the received dictionary completed with a combination of
 return names
 def __vcsAllRegisteredStates_wc(self, names, dname, shortcut=True):
 """
-Private method used to get the registered states of a number of files in the vcs.
+Private method used to get the registered states of a number of files
+in the VCS.
-This is the variant for subversion installations using the old working copy
-meta-data format.
+This is the variant for subversion installations using the old working
+copy meta-data format.
-<b>Note:</b> If a shortcut is to be taken, the code will only check, if the named
-directory has been scanned already. If so, it is assumed, that the states for
+<b>Note:</b> If a shortcut is to be taken, the code will only check,
-all files has been populated by the previous run.
+if the named directory has been scanned already. If so, it is assumed,
+that the states for all files has been populated by the previous run.
 @param names dictionary with all filenames to be checked as keys
 @param dname directory to check in (string)
 @param shortcut flag indicating a shortcut should be taken (boolean)
 @return the received dictionary completed with a combination of
 def vcsInitConfig(self, project):
 """
 Public method to initialize the VCS configuration.
-This method ensures, that eric specific files and directories are ignored.
+This method ensures, that eric specific files and directories are
+ignored.
 @param project reference to the project (Project)
 """
 configPath = getConfigPath()
 if os.path.exists(configPath):
 """
 Public method to get a dialog to enter repository info.
 @param project reference to the project object
 @param archive name of the project in the repository (string)
-@param editable flag indicating that the project name is editable (boolean)
+@param editable flag indicating that the project name is editable
+(boolean)
 @param parent parent widget (QWidget)
+@return reference to the instantiated options dialog (SvnOptionsDialog)
 """
 from .SvnOptionsDialog import SvnOptionsDialog
 return SvnOptionsDialog(self, project, parent)
 def vcsNewProjectOptionsDialog(self, parent=None):
 """
-Public method to get a dialog to enter repository info for getting a new project.
+Public method to get a dialog to enter repository info for getting a
+new project.
 @param parent parent widget (QWidget)
+@return reference to the instantiated options dialog
+(SvnNewProjectOptionsDialog)
 """
 from .SvnNewProjectOptionsDialog import SvnNewProjectOptionsDialog
 return SvnNewProjectOptionsDialog(self, parent)
 def vcsRepositoryInfos(self, ppath):
 ".".join([str(v) for v in pysvn.svn_version[:3]]),
 apiVersion,
 entry.url,
 entry.revision.number,
 entry.commit_revision.number,
-time.strftime("%Y-%m-%d", time.localtime(entry.commit_time)),
+time.strftime(
-time.strftime("%H:%M:%S %Z", time.localtime(entry.commit_time)),
+"%Y-%m-%d", time.localtime(entry.commit_time)),
+time.strftime(
+"%H:%M:%S %Z", time.localtime(entry.commit_time)),
 entry.commit_author
 )
-############################################################################
+###########################################################################
 ## Public Subversion specific methods are below.
-############################################################################
+###########################################################################
 def svnGetReposName(self, path):
 """
-Public method used to retrieve the URL of the subversion repository path.
+Public method used to retrieve the URL of the subversion repository
+path.
 @param path local path to get the svn repository path for (string)
 @return string with the repository path URL
 """
 client = pysvn.Client()
 if dlg.exec_() == QDialog.Accepted:
 propName, propValue, recurse = dlg.getData()
 if not propName:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Subversion Set Property"),
-self.trUtf8("""You have to supply a property name. Aborting."""))
+self.trUtf8(
+"""You have to supply a property name. Aborting."""))
 return
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 else:
 propName, recurse = dlg.getData()
 if not propName:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Subversion Delete Property"),
-self.trUtf8("""You have to supply a property name. Aborting."""))
+self.trUtf8(
+"""You have to supply a property name. Aborting."""))
 return
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 else:
 res = self.tagbranchList.start(path, tags)
 if res:
 if tags:
 self.tagsList = self.tagbranchList.getTagList()
 if not self.showedTags:
-self.allTagsBranchesList = self.allTagsBranchesList + self.tagsList
+self.allTagsBranchesList = \
+self.allTagsBranchesList + self.tagsList
 self.showedTags = True
 elif not tags:
 self.branchesList = self.tagbranchList.getTagList()
 if not self.showedBranches:
-self.allTagsBranchesList = self.allTagsBranchesList + self.branchesList
+self.allTagsBranchesList = \
+self.allTagsBranchesList + self.branchesList
 self.showedBranches = True
 def svnBlame(self, name):
 """
 Public method to show the output of the svn blame command.
 """
 Public method used to view the difference of a file/directory to the
 Subversion repository.
 If name is a directory and is the project directory, all project files
-are saved first. If name is a file (or list of files), which is/are being edited
+are saved first. If name is a file (or list of files), which is/are
-and has unsaved modification, they can be saved or the operation may be aborted.
+being edited and has unsaved modification, they can be saved or the
+operation may be aborted.
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
 """
 Public method used to view the difference of a file/directory of two
 repository URLs.
 If name is a directory and is the project directory, all project files
-are saved first. If name is a file (or list of files), which is/are being edited
+are saved first. If name is a file (or list of files), which is/are
-and has unsaved modification, they can be saved or the operation may be aborted.
+being edited and has unsaved modification, they can be saved or the
+operation may be aborted.
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
 return
 dname = self.splitPath(names[0])[0]
 from .SvnUrlSelectionDialog import SvnUrlSelectionDialog
-dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, dname)
+dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList,
+dname)
 if dlg.exec_() == QDialog.Accepted:
 urls, summary = dlg.getURLs()
 from .SvnDiffDialog import SvnDiffDialog
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 QApplication.processEvents()
 self.diff.start(name, urls=urls, summary=summary)
 def __svnGetFileForRevision(self, name, rev=""):
 """
-Private method to get a file for a specific revision from the repository.
+Private method to get a file for a specific revision from the
+repository.
 @param name file name to get from the repository (string)
 @keyparam rev revision to retrieve (integer or string)
 @return contents of the file (string) and an error message (string)
 """
 client = self.getClient()
 try:
 if rev:
 if isinstance(rev, int) or rev.isdecimal():
-rev = pysvn.Revision(pysvn.opt_revision_kind.number, int(rev))
+rev = pysvn.Revision(
+pysvn.opt_revision_kind.number, int(rev))
 elif rev.startswith("{"):
 dateStr = rev[1:-1]
 secs = QDateTime.fromString(dateStr, Qt.ISODate).toTime_t()
 rev = pysvn.Revision(pysvn.opt_revision_kind.date, secs)
 elif rev == "HEAD":
 return output, error
 def svnSbsDiff(self, name, extended=False, revisions=None):
 """
-Public method used to view the difference of a file to the Mercurial repository
+Public method used to view the difference of a file to the Mercurial
-side-by-side.
+repository side-by-side.
 @param name file name to be diffed (string)
 @keyparam extended flag indicating the extended variant (boolean)
 @keyparam revisions tuple of two revisions (tuple of strings)
+@exception ValueError raised to indicate an invalid name parameter type
 """
 if isinstance(name, list):
 raise ValueError("Wrong parameter type")
 if extended:
 f1.close()
 name2 = name
 except IOError:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Subversion Side-by-Side Difference"),
-self.trUtf8("""<p>The file <b>{0}</b> could not be read.</p>""")
+self.trUtf8(
+"""<p>The file <b>{0}</b> could not be read.</p>""")
 .format(name))
 return
 if self.sbsDiff is None:
 from UI.CompareDialog import CompareDialog
 def svnLock(self, name, stealIt=False, parent=None):
 """
 Public method used to lock a file in the Subversion repository.
-@param name file/directory name to be locked (string or list of strings)
+@param name file/directory name to be locked (string or list of
+strings)
 @param stealIt flag indicating a forced operation (boolean)
-@param parent reference to the parent object of the subversion dialog (QWidget)
+@param parent reference to the parent object of the subversion dialog
+(QWidget)
 """
 comment, ok = QInputDialog.getText(
 None,
 self.trUtf8("Subversion Lock"),
 self.trUtf8("Enter lock comment"),
 def svnUnlock(self, name, breakIt=False, parent=None):
 """
 Public method used to unlock a file in the Subversion repository.
-@param name file/directory name to be unlocked (string or list of strings)
+@param name file/directory name to be unlocked (string or list of
+strings)
 @param breakIt flag indicating a forced operation (boolean)
-@param parent reference to the parent object of the subversion dialog (QWidget)
+@param parent reference to the parent object of the subversion dialog
+(QWidget)
 """
 if isinstance(name, list):
 dname, fnames = self.splitPathList(name)
 else:
 dname, fname = self.splitPath(name)
 if dlg.exec_() == QDialog.Accepted:
 newUrl, inside = dlg.getData()
 if inside:
 msg = "switch {0} {1}".format(newUrl, projectPath)
 else:
-msg = "relocate {0} {1} {2}".format(currUrl, newUrl, projectPath)
+msg = "relocate {0} {1} {2}".format(currUrl, newUrl,
+projectPath)
 client = self.getClient()
 dlg = \
 SvnDialog(self.trUtf8('Relocating'), msg, client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 client)
 QApplication.processEvents()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
 for name in names:
-client.add_to_changelist(name, clname, depth=pysvn.depth.infinity)
+client.add_to_changelist(name, clname,
+depth=pysvn.depth.infinity)
 except pysvn.ClientError as e:
 dlg.showError(e.args[0])
 locker.unlock()
 dlg.finish()
 dlg.exec_()
 client = self.getClient()
 if hasattr(client, 'get_changelist'):
 ppath = e5App().getObject("Project").getProjectPath()
 locker = QMutexLocker(self.vcsExecutionMutex)
 try:
-entries = client.get_changelist(ppath, depth=pysvn.depth.infinity)
+entries = client.get_changelist(ppath,
+depth=pysvn.depth.infinity)
 for entry in entries:
 changelist = entry[1]
 if changelist not in changelists:
 changelists.append(changelist)
 except pysvn.ClientError:
 pass
 locker.unlock()
 return changelists
-############################################################################
+###########################################################################
 ## Private Subversion specific methods are below.
-############################################################################
+###########################################################################
 def __svnURL(self, url):
 """
 Private method to format a url for subversion.
 url = url.split(':', 2)
 if len(url) == 3:
 scheme = url[0]
 host = url[1]
 port, path = url[2].split("/", 1)
-return "{0}:{1}:{2}/{3}".format(scheme, host, port, urllib.parse.quote(path))
+return "{0}:{1}:{2}/{3}".format(scheme, host, port,
+urllib.parse.quote(path))
 else:
 scheme = url[0]
 if scheme == "file":
 return "{0}:{1}".format(scheme, urllib.parse.quote(url[1]))
 else:
 try:
 host, path = url[1][2:].split("/", 1)
 except ValueError:
 host = url[1][2:]
 path = ""
-return "{0}://{1}/{2}".format(scheme, host, urllib.parse.quote(path))
+return "{0}://{1}/{2}".format(scheme, host,
+urllib.parse.quote(path))
 def svnNormalizeURL(self, url):
 """
 Public method to normalize a url for subversion.
 url = url[:-1]
 if not url.startswith("/") and url[1] in [":", "|"]:
 url = "/{0}".format(url)
 return "{0}://{1}".format(protocol, url)
-############################################################################
+###########################################################################
 ## Methods to get the helper objects are below.
-############################################################################
+###########################################################################
-def vcsGetProjectBrowserHelper(self, browser, project, isTranslationsBrowser=False):
+def vcsGetProjectBrowserHelper(self, browser, project,
-"""
+isTranslationsBrowser=False):
-Public method to instanciate a helper object for the different project browsers.
+"""
+Public method to instanciate a helper object for the different
+project browsers.
 @param browser reference to the project browser object
 @param project reference to the project object
-@param isTranslationsBrowser flag indicating, the helper is requested for the
+@param isTranslationsBrowser flag indicating, the helper is requested
-translations browser (this needs some special treatment)
+for the translations browser (this needs some special treatment)
 @return the project browser helper object
 """
 from .ProjectBrowserHelper import SvnProjectBrowserHelper
-return SvnProjectBrowserHelper(self, browser, project, isTranslationsBrowser)
+return SvnProjectBrowserHelper(self, browser, project,
+isTranslationsBrowser)
 def vcsGetProjectHelper(self, project):
 """
 Public method to instanciate a helper object for the project.
 @return the project helper object
 """
 helper = self.__plugin.getProjectHelper()
 helper.setObjects(self, project)
 self.__wcng = \
-os.path.exists(os.path.join(project.getProjectPath(), ".svn", "format")) or \
+os.path.exists(
-os.path.exists(os.path.join(project.getProjectPath(), "_svn", "format"))
+os.path.join(project.getProjectPath(), ".svn", "format")) or \
+os.path.exists(
+os.path.join(project.getProjectPath(), "_svn", "format"))
 return helper
-############################################################################
+###########################################################################
 ##  Status Monitor Thread methods
-############################################################################
+###########################################################################
 def _createStatusMonitorThread(self, interval, project):
 """
-Protected method to create an instance of the VCS status monitor thread.
+Protected method to create an instance of the VCS status monitor
+thread.
+@param interval check interval for the monitor thread in seconds
+(integer)
 @param project reference to the project object
-@param interval check interval for the monitor thread in seconds (integer)
 @return reference to the monitor thread (QThread)
 """
 from .SvnStatusMonitorThread import SvnStatusMonitorThread
 return SvnStatusMonitorThread(interval, project, self)

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py

Plugins/VcsPlugins/vcsPySvn/subversion.py