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

-:1b59c4ba121e
+:8cd4d08fa9f6
 Module implementing the version control systems interface to Subversion.
 """
 import os
 import shutil
-import urllib.request, urllib.parse, urllib.error
+import urllib.request
+import urllib.parse
+import urllib.error
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from E5Gui.E5Application import e5App
 from .ProjectBrowserHelper import SvnProjectBrowserHelper
 import Preferences
 import Utilities
 class Subversion(VersionControl):
 """
 Class implementing the version control systems interface to Subversion.
 @signal committed() emitted after the commit action has completed
 @param parent parent widget (QWidget)
 @param name name of this object (string)
 """
 VersionControl.__init__(self, parent, name)
 self.defaultOptions = {
-'global' :   [''],
+'global':   [''],
-'commit' :   [''],
+'commit':   [''],
-'checkout' : [''],
+'checkout': [''],
-'update' :   [''],
+'update':   [''],
-'add' :      [''],
+'add':      [''],
-'remove' :   [''],
+'remove':   [''],
-'diff' :     [''],
+'diff':     [''],
-'log' :      [''],
+'log':      [''],
-'history' :  [''],
+'history':  [''],
-'status' :   [''],
+'status':   [''],
-'tag' :      [''],
+'tag':      [''],
-'export' :   ['']
+'export':   ['']
 }
 self.interestingDataKeys = [
 "standardLayout",
 ]
 self.mergeList = [[], [], []]
 self.showedTags = False
 self.showedBranches = False
 self.tagTypeList = [
 'tags',
 'branches',
 ]
 self.commandHistory = []
 self.wdHistory = []
 else:
 errMsg = self.trUtf8("Could not start the svn executable.")
 return False, errMsg
-def vcsInit(self, vcsDir, noDialog = False):
+def vcsInit(self, vcsDir, noDialog=False):
 """
 Public method used to initialize the subversion repository.
 The subversion repository has to be initialized from outside eric5
 because the respective command always works locally. Therefore we
 project.setDirty(True)
 project.saveProject()
 project.closeProject()
 return
 shutil.rmtree(tmpProjectDir, True)
-project.closeProject(noSave = True)
+project.closeProject(noSave=True)
 project.openProject(pfn)
-def vcsImport(self, vcsDataDict, projectDir, noDialog = False):
+def vcsImport(self, vcsDataDict, projectDir, noDialog=False):
 """
 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)
 if vcsDir.startswith('/'):
 vcsDir = 'file://{0}'.format(vcsDir)
 elif vcsDir[1] in ['|', ':']:
 vcsDir = 'file:///{0}'.format(vcsDir)
-project = vcsDir[vcsDir.rfind('/')+1:]
+project = vcsDir[vcsDir.rfind('/') + 1:]
 # create the dir structure to be imported into the repository
 tmpDir = '{0}_tmp'.format(projectDir)
 try:
 os.makedirs(tmpDir)
 shutil.copytree(projectDir, os.path.join(tmpDir, project, 'trunk'))
 else:
 shutil.copytree(projectDir, os.path.join(tmpDir, project))
 except OSError:
 if os.path.isdir(tmpDir):
 shutil.rmtree(tmpDir, True)
 return False, False
 args = []
 args.append('import')
 self.addArguments(args, self.options['global'])
 status = dia.normalExit()
 shutil.rmtree(tmpDir, True)
 return status, False
-def vcsCheckout(self, vcsDataDict, projectDir, noDialog = False):
+def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False):
 """
 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)
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 return dia.normalExit()
-def vcsCommit(self, name, message, noDialog = False):
+def vcsCommit(self, name, message, noDialog=False):
 """
 Public method used to make the change of a file/directory permanent in the
 Subversion repository.
 @param name file/directory name to be committed (string or list of strings)
 if res:
 dia.exec_()
 self.committed.emit()
 self.checkVCSStatus()
-def vcsUpdate(self, name, noDialog = False):
+def vcsUpdate(self, name, noDialog=False):
 """
 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 noDialog flag indicating quiet operations (boolean)
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
-def vcsAdd(self, name, isDir = False, noDialog = False):
+def vcsAdd(self, name, isDir=False, noDialog=False):
 """
 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)
 self.trUtf8('Adding files/directories to the Subversion repository'))
 res = dia.startProcess(args, wdir)
 if res:
 dia.exec_()
-def vcsAddBinary(self, name, isDir = False):
+def vcsAddBinary(self, name, isDir=False):
 """
 Public method used to add a file/directory in binary mode to the
 Subversion repository.
 @param name file/directory name to be added (string)
 if isinstance(path, list):
 dname, fnames = self.splitPathList(path)
 for n in path:
 d = os.path.split(n)[0]
 while not os.path.exists(os.path.join(d, self.adminDir)):
 # add directories recursively,
 # if they aren't in the repository already
 if d in tree:
 break
 tree.append(d)
 d = os.path.split(d)[0]
 self.trUtf8('Adding directory trees to the Subversion repository'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
-def vcsRemove(self, name, project = False, noDialog = False):
+def vcsRemove(self, name, project=False, noDialog=False):
 """
 Public method used to remove a file/directory from the Subversion repository.
 The default operation is to remove the local copy as well.
 dia.exec_()
 res = dia.normalExit()
 return res
-def vcsMove(self, name, project, target = None, noDialog = False):
+def vcsMove(self, name, project, target=None, noDialog=False):
 """
 Public method used to move a file/directory.
 @param name file/directory name to be moved (string)
 @param project reference to the project object
 project.removeFile(name)
 return res
 def vcsLog(self, name):
 """
 Public method used to view the log of a file/directory from the
 Subversion repository.
 @param name file/directory name to show the log of (string)
 """
 self.log = SvnLogDialog(self)
 self.log.show()
 self.log.start(name)
 def vcsDiff(self, name):
 """
 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
 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):
 else:
 names = [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = e5App().getObject("ViewManager").getOpenEditor(nam)
-if editor and not editor.checkDirty() :
+if editor and not editor.checkDirty():
 return
 else:
 project = e5App().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 QApplication.processEvents()
 self.diff.start(name)
 def vcsStatus(self, name):
 """
 Public method used to view the status of files/directories in the
 Subversion repository.
 @param name file/directory name(s) to show the status of
 (string or list of strings)
 """
 self.status.show()
 self.status.start(name)
 def vcsTag(self, name):
 """
 Public method used to set the tag of a file/directory in the
 Subversion repository.
 @param name file/directory name to be tagged (string)
 """
 dname, fname = self.splitPath(name)
 if self.otherData["standardLayout"]:
 url = None
 else:
 url = self.svnNormalizeURL(reposURL)
 dlg = SvnTagDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
 if dlg.exec_() == QDialog.Accepted:
 tag, tagOp = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 self.allTagsBranchesList.remove(tag)
 if self.otherData["standardLayout"]:
 url = None
 else:
 url = self.svnNormalizeURL(reposURL)
 dlg = SvnSwitchDialog(self.allTagsBranchesList, url,
 self.otherData["standardLayout"])
 if dlg.exec_() == QDialog.Accepted:
 tag, tagType = dlg.getParameters()
 if tag in self.allTagsBranchesList:
 self.allTagsBranchesList.remove(tag)
 opts = self.options['global'][:]
 force = '--force' in opts
 if force:
 del opts[opts.index('--force')]
 dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2],
 force)
 if dlg.exec_() == QDialog.Accepted:
 urlrev1, urlrev2, target, force = dlg.getParameters()
 else:
 return
 return self.canBeCommitted
 else:
 return self.canBeAdded
 name = os.path.normcase(name)
-states = { name : 0 }
+states = {name: 0}
 states = self.vcsAllRegisteredStates(states, dname, False)
 if states[name] == self.canBeCommitted:
 return self.canBeCommitted
 else:
 return self.canBeAdded
-def vcsAllRegisteredStates(self, names, dname, shortcut = True):
+def vcsAllRegisteredStates(self, names, dname, shortcut=True):
 """
 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
 all files have 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
 canBeCommited and canBeAdded or None in order to signal an error
 """
 if not os.path.isdir(os.path.join(dname, self.adminDir)):
 # not under version control -> do nothing
 return names
 dia = SvnDialog(self.trUtf8('Subversion command'))
 res = dia.startProcess(args, wd)
 if res:
 dia.exec_()
-def vcsOptionsDialog(self, project, archive, editable = False, parent = None):
+def vcsOptionsDialog(self, project, archive, editable=False, parent=None):
 """
 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 parent parent widget (QWidget)
 """
 return SvnOptionsDialog(self, project, parent)
-def vcsNewProjectOptionsDialog(self, parent = None):
+def vcsNewProjectOptionsDialog(self, parent=None):
 """
 Public method to get a dialog to enter repository info for getting a new project.
 @param parent parent widget (QWidget)
 """
 @param ppath local path to get the repository infos (string)
 @return string with ready formated info for display (string)
 """
 info = {\
-'committed-rev' : '',
+'committed-rev': '',
-'committed-date' : '',
+'committed-date': '',
-'committed-time' : '',
+'committed-time': '',
-'url' : '',
+'url': '',
-'last-author' : '',
+'last-author': '',
-'revision' : ''
+'revision': ''
 }
 ioEncoding = Preferences.getSystem("IOEncoding")
 process = QProcess()
 elif line.startswith('<commit'):
 commitFound = True
 elif line.startswith('</commit>'):
 commitFound = False
 elif line.startswith("revision="):
-rev = line[line.find('"')+1:line.rfind('"')]
+rev = line[line.find('"') + 1:line.rfind('"')]
 if entryFound:
 info['revision'] = rev
 entryFound = False
 elif commitFound:
 info['committed-rev'] = rev
 """<tr><td><b>Committed date</b></td><td>{4}</td></tr>"""
 """<tr><td><b>Comitted time</b></td><td>{5}</td></tr>"""
 """<tr><td><b>Last author</b></td><td>{6}</td></tr>"""
 """</table>"""
 )\
 .format(self.versionStr,
 info['url'],
 info['revision'],
 info['committed-rev'],
 info['committed-date'],
 info['committed-time'],
 info['last-author'])
 ############################################################################
 ## Public Subversion specific methods are below.
 ############################################################################
 project.copyDirectory(name, target)
 else:
 project.appendFile(target)
 return res
-def svnListProps(self, name, recursive = False):
+def svnListProps(self, name, recursive=False):
 """
 Public method used to list the properties of a file/directory.
 @param name file/directory name (string or list of strings)
 @param recursive flag indicating a recursive list is requested
 """
 self.propList = SvnPropListDialog(self)
 self.propList.show()
 self.propList.start(name, recursive)
-def svnSetProp(self, name, recursive = False):
+def svnSetProp(self, name, recursive=False):
 """
 Public method used to add a property to a file/directory.
 @param name file/directory name (string or list of strings)
 @param recursive flag indicating a recursive list is requested
 dia = SvnDialog(self.trUtf8('Subversion Set Property'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
-def svnDelProp(self, name, recursive = False):
+def svnDelProp(self, name, recursive=False):
 """
 Public method used to delete a property of a file/directory.
 @param name file/directory name (string or list of strings)
 @param recursive flag indicating a recursive list is requested
 dia = SvnDialog(self.trUtf8('Subversion Delete Property'))
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
-def svnListTagBranch(self, path, tags = True):
+def svnListTagBranch(self, path, tags=True):
 """
 Public method used to list the available tags or branches.
 @param path directory name of the project (string)
 @param tags flag indicating listing of branches or tags
 self.showedTags = True
 allTagsBranchesList = self.allTagsBranchesList
 else:
 self.tagsList = []
 allTagsBranchesList = None
 self.tagbranchList.start(path, tags,
 self.tagsList, allTagsBranchesList)
 elif not tags:
 if not self.showedBranches:
 self.showedBranches = True
 allTagsBranchesList = self.allTagsBranchesList
 else:
 self.branchesList = []
 allTagsBranchesList = None
 self.tagbranchList.start(path, tags,
 self.branchesList, self.allTagsBranchesList)
 def svnBlame(self, name):
 """
 Public method to show the output of the svn blame command.
 self.blame.show()
 self.blame.start(name)
 def svnExtendedDiff(self, name):
 """
 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
 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)
 else:
 names = [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = e5App().getObject("ViewManager").getOpenEditor(nam)
-if editor and not editor.checkDirty() :
+if editor and not editor.checkDirty():
 return
 else:
 project = e5App().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 """
 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
 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)
 else:
 names = [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = e5App().getObject("ViewManager").getOpenEditor(nam)
-if editor and not editor.checkDirty() :
+if editor and not editor.checkDirty():
 return
 else:
 project = e5App().getObject("Project")
 if nam == project.ppath and not project.saveAllScripts():
 return
 if dlg.exec_() == QDialog.Accepted:
 urls, summary = dlg.getURLs()
 self.diff = SvnDiffDialog(self)
 self.diff.show()
 QApplication.processEvents()
-self.diff.start(name, urls = urls, summary = summary)
+self.diff.start(name, urls=urls, summary=summary)
 def svnLogLimited(self, name):
 """
 Public method used to view the (limited) log of a file/directory from the
 Subversion repository.
 @param name file/directory name to show the log of (string)
 """
 noEntries, ok = QInputDialog.getInteger(
 self.log.show()
 self.log.start(name, noEntries)
 def svnLogBrowser(self, path):
 """
 Public method used to browse the log of a file/directory from the
 Subversion repository.
 @param path file/directory name to show the log of (string)
 """
 self.logBrowser = SvnLogBrowserDialog(self)
 dia = SvnDialog(self.trUtf8('Relocating'))
 res = dia.startProcess(args)
 if res:
 dia.exec_()
-def svnRepoBrowser(self, projectPath = None):
+def svnRepoBrowser(self, projectPath=None):
 """
 Public method to open the repository browser.
 @param projectPath path name of the project (string)
 """
 url = self.svnNormalizeURL(url)
 url = url.split(':', 2)
 if len(url) == 3:
 scheme = url[0]
 host = url[1]
-port, path = url[2].split("/",1)
+port, path = url[2].split("/", 1)
 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]))
 ############################################################################
 ## 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.
 @param browser reference to the project browser object
 @param project reference to the project object

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py

Plugins/VcsPlugins/vcsSubversion/subversion.py