eric: comparison Plugins/VcsPlugins/vcsMercurial/hg.py

-:1b59c4ba121e
+:8cd4d08fa9f6
 Module implementing the version control systems interface to Mercurial.
 """
 import os
 import shutil
-import urllib.request, urllib.parse, urllib.error
+import urllib.request
+import urllib.parse
+import urllib.error
 from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo
 from PyQt4.QtGui import QApplication, QDialog, QInputDialog
 from E5Gui.E5Application import e5App
 from .ProjectBrowserHelper import HgProjectBrowserHelper
 import Preferences
 import Utilities
 class Hg(VersionControl):
 """
 Class implementing the version control systems interface to Mercurial.
 @signal committed() emitted after the commit action has completed
 """
 committed = pyqtSignal()
-def __init__(self, plugin, parent = None, name = None):
+def __init__(self, plugin, parent=None, name=None):
 """
 Constructor
 @param plugin reference to the plugin object
 @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.__plugin = plugin
 self.__ui = parent
 self.allTagsBranchesList = []
 self.showedTags = False
 self.showedBranches = False
 self.tagTypeList = [
 'tags',
 'branches',
 ]
 self.commandHistory = []
 if "HG_ASP_DOT_NET_HACK" in os.environ:
 else:
 errMsg = self.trUtf8("Could not start the hg executable.")
 return False, errMsg
-def vcsInit(self, vcsDir, noDialog = False):
+def vcsInit(self, vcsDir, noDialog=False):
 """
 Public method used to initialize the mercurial repository.
 The initialization is done, when a project is converted into a Mercurial
 controlled project. Therefore we always return TRUE without doing anything.
 @param vcsDir name of the VCS directory (string)
 @param noDialog flag indicating quiet operations (boolean)
 @return always TRUE
 if not os.path.isfile(pfn):
 pfn += "z"
 project.closeProject()
 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)
 dia.exec_()
 status = dia.normalExit()
 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 a Mercurial repository (clone).
 @param vcsDataDict dictionary of data required for the checkout
 @param projectDir project directory to create (string)
 shutil.rmtree(os.path.join(projectDir, self.adminDir), True)
 if os.path.exists(os.path.join(projectDir, '.hgignore')):
 os.remove(os.path.join(projectDir, '.hgignore'))
 return status
-def vcsCommit(self, name, message, noDialog = False, closeBranch = False):
+def vcsCommit(self, name, message, noDialog=False, closeBranch=False):
 """
 Public method used to make the change of a file/directory permanent in the
 Mercurial repository.
 @param name file/directory name to be committed (string or list of strings)
 for name in self.__forgotNames:
 model.updateVCSStatus(name)
 self.__forgotNames = []
 self.checkVCSStatus()
-def vcsUpdate(self, name, noDialog = False, revision = None):
+def vcsUpdate(self, name, noDialog=False, revision=None):
 """
 Public method used to update a file/directory with the Mercurial 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 Mercurial 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 Mercurial repository'))
 res = dia.startProcess(args, repodir)
 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
 Mercurial repository.
 @param name file/directory name to be added (string)
 """
 Public method to add a directory tree rooted at path to the Mercurial repository.
 @param path root directory of the tree to be added (string or list of strings))
 """
-self.vcsAdd(path, isDir = False)
+self.vcsAdd(path, isDir=False)
-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 Mercurial repository.
 The default operation is to remove the local copy as well.
 dia.exec_()
 res = dia.normalExitWithoutErrors()
 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
 Mercurial repository.
 @param name file/directory name to show the log of (string)
 """
 self.log = HgLogDialog(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
 Mercurial 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
 Mercurial repository.
 @param name file/directory name(s) to show the status of
 (string or list of strings)
 """
 @param name directory name to be switched (string)
 """
 dlg = HgRevisionSelectionDialog(self.tagsList, self.branchesList)
 if dlg.exec_() == QDialog.Accepted:
 rev = dlg.getRevision()
-self.vcsUpdate(name, revision = rev)
+self.vcsUpdate(name, revision=rev)
 def vcsRegisteredState(self, name):
 """
 Public method used to get the registered state of a file in the vcs.
 if absname == name:
 return self.canBeCommitted
 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 dname.endswith(os.sep):
 dname = dname[:-1]
 dname = os.path.normcase(dname)
 dia = HgDialog(self.trUtf8('Mercurial command'))
 res = dia.startProcess(args, repodir)
 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 HgOptionsDialog(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)
 """
 process.start('hg', args)
 procStarted = process.waitForStarted()
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
 output = str(process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 index = 0
 for line in output.splitlines():
 index += 1
 changeset, tags, author, date, branches = line.split("@@@")
 cdate, ctime = date.split()[:2]
 info.append("""<p><table>""")
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n"""
 """<tr><td><b>Changeset</b></td><td>{1}</td></tr>""")\
 .format(index, changeset))
 if tags:
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(tags.split())))
 if branches:
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(branches.split())))
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n"""
 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")\
 .format(author, cdate, ctime))
 info.append("""</table></p>""")
 url = ""
-args =  []
+args = []
 args.append('showconfig')
 args.append('paths.default')
 process.setWorkingDirectory(ppath)
 process.start('hg', args)
 procStarted = process.waitForStarted()
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
 output = str(process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 if output:
 url = output.splitlines()[0].strip()
 else:
 url = ""
 url = url.split(':', 2)
 if len(url) == 4:
 scheme = url[0]
 user = url[1]
 host = url[2]
-port, path = url[3].split("/",1)
+port, path = url[3].split("/", 1)
 return "{0}:{1}:{2}:{3}/{4}".format(
 scheme, user, host, port, urllib.parse.quote(path))
 elif 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]))
 else:
-host, path = url[1][2:].split("/",1)
+host, path = url[1][2:].split("/", 1)
 return "{0}://{1}/{2}".format(scheme, host, urllib.parse.quote(path))
 def hgNormalizeURL(self, url):
 """
 Public method to normalize a url for Mercurial.
 project.copyDirectory(name, target)
 else:
 project.appendFile(target)
 return res
-def hgListTagBranch(self, path, tags = True):
+def hgListTagBranch(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)
 else:
 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 hgAnnotate(self, name):
 """
 Public method to show the output of the hg annotate command.
 self.annotate.show()
 self.annotate.start(name)
 def hgExtendedDiff(self, name):
 """
 Public method used to view the difference of a file/directory to the
 Mercurial 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
 self.diff.show()
 self.diff.start(name, revisions)
 def hgLogLimited(self, name):
 """
 Public method used to view the (limited) log of a file/directory from the
 Mercurial 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 hgLogBrowser(self, path):
 """
 Public method used to browse the log of a file/directory from the
 Mercurial repository.
 @param path file/directory name to show the log of (string)
 """
 self.logBrowser = HgLogBrowserDialog(self)
 self.logBrowser.show()
 self.logBrowser.start(path)
 def hgIncoming(self, name):
 """
 Public method used to view the log of incoming changes from the
 Mercurial repository.
 @param name file/directory name to show the log of (string)
 """
 if self.getPlugin().getPreferences("UseLogBrowser"):
-self.logBrowser = HgLogBrowserDialog(self, mode = "incoming")
+self.logBrowser = HgLogBrowserDialog(self, mode="incoming")
 self.logBrowser.show()
 self.logBrowser.start(name)
 else:
-self.log = HgLogDialog(self, mode = "incoming")
+self.log = HgLogDialog(self, mode="incoming")
 self.log.show()
 self.log.start(name)
 def hgOutgoing(self, name):
 """
 Public method used to view the log of outgoing changes from the
 Mercurial repository.
 @param name file/directory name to show the log of (string)
 """
 if self.getPlugin().getPreferences("UseLogBrowser"):
-self.logBrowser = HgLogBrowserDialog(self, mode = "outgoing")
+self.logBrowser = HgLogBrowserDialog(self, mode="outgoing")
 self.logBrowser.show()
 self.logBrowser.start(name)
 else:
-self.log = HgLogDialog(self, mode = "outgoing")
+self.log = HgLogDialog(self, mode="outgoing")
 self.log.show()
 self.log.start(name)
 def hgPull(self, name):
 """
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 return res
-def hgPush(self, name, force = False):
+def hgPush(self, name, force=False):
 """
 Public method used to push changes to a remote Mercurial repository.
 @param name directory name of the project to be pushed from (string)
 @keyparam force flag indicating a forced push (boolean)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
-def hgInfo(self, ppath, mode = "heads"):
+def hgInfo(self, ppath, mode="heads"):
 """
 Public method to show information about the heads of the repository.
 @param ppath local path to get the repository infos (string)
 @keyparam mode mode of the operation (string, one of heads, parents, tip)
 process.start('hg', args)
 procStarted = process.waitForStarted()
 if procStarted:
 finished = process.waitForFinished(30000)
 if finished and process.exitCode() == 0:
 output = str(process.readAllStandardOutput(),
 Preferences.getSystem("IOEncoding"), 'replace')
 index = 0
 for line in output.splitlines():
 index += 1
 changeset, tags, author, date, branches, parents = line.split("@@@")
 cdate, ctime = date.split()[:2]
 info.append("""<p><table>""")
 if mode == "heads":
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Head #{0}</b></td><td></td></tr>\n"""
 .format(index, changeset)))
 elif mode == "parents":
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n"""
 .format(index, changeset)))
 elif mode == "tip":
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Tip</b></td><td></td></tr>\n"""))
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Changeset</b></td><td>{0}</td></tr>""")\
 .format(changeset))
 if tags:
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Tags</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(tags.split())))
 if branches:
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Branches</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(branches.split())))
 if parents:
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Parents</b></td><td>{0}</td></tr>""")\
 .format('<br/>'.join(parents.split())))
 info.append(QApplication.translate("mercurial",
 """<tr><td><b>Last author</b></td><td>{0}</td></tr>\n"""
 """<tr><td><b>Committed date</b></td><td>{1}</td></tr>\n"""
 """<tr><td><b>Committed time</b></td><td>{2}</td></tr>\n"""
 """</table></p>""")\
 .format(author, cdate, ctime))
 dia = HgDialog(self.trUtf8('Identifying project directory'))
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
-def hgCreateIgnoreFile(self, name, autoAdd = False):
+def hgCreateIgnoreFile(self, name, autoAdd=False):
 """
 Public method to create the ignore file.
 @param name directory name to create the ignore file in (string)
 @param autoAdd flag indicating to add it automatically (boolean)
 @return flag indicating success
 """
 status = False
 ignorePatterns = [
 "glob:.eric5project",
 "glob:.ropeproject",
 "glob:.directory",
 "glob:**.pyc",
 "glob:**.orig",
 "glob:**.bak",
 ]
 ignoreName = os.path.join(name, ".hgignore")
 if os.path.exists(ignoreName):
 res = E5MessageBox.yesNo(self.__ui,
 self.trUtf8("Create .hgignore file"),
 self.trUtf8("""<p>The file <b>{0}</b> exists already."""
 """ Overwrite it?</p>""").format(ignoreName),
-icon = E5MessageBox.Warning)
+icon=E5MessageBox.Warning)
 else:
 res = True
 if res:
 try:
 # create a .hgignore file
 status = True
 except IOError:
 status = False
 if status and autoAdd:
-self.vcsAdd(ignoreName, noDialog = True)
+self.vcsAdd(ignoreName, noDialog=True)
 project = e5App().getObject("Project")
 project.appendFile(ignoreName)
 return status
 res = E5MessageBox.yesNo(self.__ui,
 self.trUtf8("Create changegroup"),
 self.trUtf8("<p>The Mercurial changegroup file <b>{0}</b> "
 "already exists. Overwrite it?</p>")
 .format(fname),
-icon = E5MessageBox.Warning)
+icon=E5MessageBox.Warning)
 if not res:
 return
 fname = Utilities.toNativeSeparators(fname)
 args = []
 repodir,
 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if file:
 if self.getPlugin().getPreferences("UseLogBrowser"):
 self.logBrowser = \
-HgLogBrowserDialog(self, mode = "incoming", bundle = file)
+HgLogBrowserDialog(self, mode="incoming", bundle=file)
 self.logBrowser.show()
 self.logBrowser.start(name)
 else:
-self.log = HgLogDialog(self, mode = "incoming", bundle = file)
+self.log = HgLogDialog(self, mode="incoming", bundle=file)
 self.log.show()
 self.log.start(name)
 def hgIdentifyBundle(self, name):
 """
 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"))
 if files:
 update = E5MessageBox.yesNo(self.__ui,
 self.trUtf8("Apply changegroups"),
 self.trUtf8("""Shall the working directory be updated?"""),
-yesDefault = True)
+yesDefault=True)
 args = []
 args.append('unbundle')
 if update:
 args.append("--update")
 if repodir == os.sep:
 return
 rev = ""
 if subcommand in ("good", "bad"):
 dlg = HgRevisionSelectionDialog(self.tagsList, self.branchesList,
-showNone =True)
+showNone=True)
 if dlg.exec_() == QDialog.Accepted:
 rev = dlg.getRevision()
 else:
 return
 ############################################################################
 ## 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/vcsMercurial/hg.py

Plugins/VcsPlugins/vcsMercurial/hg.py