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

-:9986ec0e559a
+:10516539f238
 class Hg(VersionControl):
 """
 Class implementing the version control systems interface to Mercurial.
 @signal committed() emitted after the commit action has completed
-@signal activeExtensionsChanged() emitted when the list of active extensions
+@signal activeExtensionsChanged() emitted when the list of active
-has changed
+extensions has changed
 """
 committed = pyqtSignal()
 activeExtensionsChanged = pyqtSignal()
 IgnoreFileName = ".hgignore"
 def vcsExists(self):
 """
 Public method used to test for the presence of the hg 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 = ''
 errMsg = ""
 ioEncoding = Preferences.getSystem("IOEncoding")
 self.version = tuple(v)
 self.__getExtensionsInfo()
 return True, errMsg
 else:
 if finished:
-errMsg = \
+errMsg = self.trUtf8(
-self.trUtf8("The hg process finished with the exit code {0}")\
+"The hg process finished with the exit code {0}")\
 .format(process.exitCode())
 else:
-errMsg = self.trUtf8("The hg process did not finish within 30s.")
+errMsg = self.trUtf8(
+"The hg process did not finish within 30s.")
 else:
 errMsg = self.trUtf8("Could not start the hg executable.")
 return False, errMsg
 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
+The initialization is done, when a project is converted into a
-controlled project. Therefore we always return TRUE without doing anything.
+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
 """
 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 repository"),
-self.trUtf8("""The project repository could not be created."""))
+self.trUtf8(
+"""The project repository could not be created."""))
 else:
 pfn = project.pfile
 if not os.path.isfile(pfn):
 pfn += "z"
 project.closeProject()
 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 Mercurial 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)
 args = []
 args.append('commit')
 args.append('--addremove')
 args.append('--message')
 args.append(msg)
-dia = HgDialog(self.trUtf8('Initial commit to Mercurial repository'),
+dia = HgDialog(
-self)
+self.trUtf8('Initial commit to Mercurial repository'),
+self)
 res = dia.startProcess(args, projectDir)
 if res:
 dia.exec_()
 status = dia.normalExit()
 return status, False
 def vcsCheckout(self, vcsDataDict, projectDir, noDialog=False):
 """
-Public method used to check the project out of a Mercurial repository (clone).
+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)
 @param noDialog flag indicating quiet operations
 @return flag indicating an execution without errors (boolean)
 return self.startSynchronizedProcess(QProcess(), 'hg', args)
 else:
 out, err = self.__client.runcommand(args)
 return err == ""
 else:
-dia = HgDialog(self.trUtf8('Cloning project from a Mercurial repository'),
+dia = HgDialog(
-self)
+self.trUtf8('Cloning project from a Mercurial repository'),
+self)
 res = dia.startProcess(args)
 if res:
 dia.exec_()
 return dia.normalExit()
 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 Mercurial 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)
 """
 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, mq=False):
+def vcsCommit(self, name, message, noDialog=False, closeBranch=False,
-"""
+mq=False):
-Public method used to make the change of a file/directory permanent in the
+"""
-Mercurial repository.
+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)
+@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
 @keyparam closeBranch flag indicating a close branch commit (boolean)
 @keyparam mq flag indicating a queue commit (boolean)
 """
 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.checkDirty()
+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:
 args.append(fname)
 if noDialog:
 self.startSynchronizedProcess(QProcess(), "hg", args, dname)
 else:
-dia = HgDialog(self.trUtf8('Committing changes to Mercurial repository'),
+dia = HgDialog(
-self)
+self.trUtf8('Committing changes to Mercurial repository'),
+self)
 res = dia.startProcess(args, dname)
 if res:
 dia.exec_()
 self.committed.emit()
 if self.__forgotNames:
 self.__forgotNames = []
 self.checkVCSStatus()
 def vcsUpdate(self, name, noDialog=False, revision=None):
 """
-Public method used to update a file/directory with the Mercurial repository.
+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 name file/directory name to be updated (string or list of
+strings)
 @param noDialog flag indicating quiet operations (boolean)
 @keyparam revision revision to update to (string)
 @return flag indicating, that the update contained an add
 or delete (boolean)
 """
 self.startSynchronizedProcess(QProcess(), 'hg', args, repodir)
 else:
 out, err = self.__client.runcommand(args)
 res = False
 else:
-dia = HgDialog(self.trUtf8('Synchronizing with the Mercurial repository'),
+dia = HgDialog(self.trUtf8(
-self)
+'Synchronizing with the Mercurial repository'),
+self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 self.startSynchronizedProcess(QProcess(), 'hg', args, repodir)
 else:
 out, err = self.__client.runcommand(args)
 else:
 dia = HgDialog(
-self.trUtf8('Adding files/directories to the Mercurial repository'), self)
+self.trUtf8(
+'Adding files/directories to the Mercurial repository'),
+self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def vcsAddBinary(self, name, isDir=False):
 """
 self.vcsAdd(name, isDir)
 def vcsAddTree(self, path):
 """
-Public method to add a directory tree rooted at path to the Mercurial repository.
+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))
+@param path root directory of the tree to be added (string or list of
+strings))
 """
 self.vcsAdd(path, isDir=False)
 def vcsRemove(self, name, project=False, noDialog=False):
 """
-Public method used to remove a file/directory from the Mercurial repository.
+Public method used to remove a file/directory from the Mercurial
+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)
 """
 args = []
 args.append('remove')
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 if noDialog:
 if self.__client is None:
-res = self.startSynchronizedProcess(QProcess(), 'hg', args, repodir)
+res = self.startSynchronizedProcess(
+QProcess(), 'hg', args, repodir)
 else:
 out, err = self.__client.runcommand(args)
 res = err == ""
 else:
 dia = HgDialog(
-self.trUtf8('Removing files/directories from the Mercurial repository'),
+self.trUtf8(
+'Removing files/directories from the Mercurial'
+' repository'),
 self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.normalExitWithoutErrors()
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 if noDialog:
-res = self.startSynchronizedProcess(QProcess(), "hg", args, repodir)
 if self.__client is None:
-res = self.startSynchronizedProcess(QProcess(), 'hg', args, repodir)
+res = self.startSynchronizedProcess(
+QProcess(), 'hg', args, repodir)
 else:
 out, err = self.__client.runcommand(args)
 res = err == ""
 else:
 dia = HgDialog(self.trUtf8('Renaming {0}').format(name), self)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
-self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+self.getExtensionObject("bookmarks")\
+.hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
-from .HgMultiRevisionSelectionDialog import HgMultiRevisionSelectionDialog
+from .HgMultiRevisionSelectionDialog import \
+HgMultiRevisionSelectionDialog
 dlg = HgMultiRevisionSelectionDialog(
 self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 bookmarksList,
 emptyRevsOk=True,
 """
 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
+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[:]
 @param mq flag indicating to show the queue status as well (boolean)
 """
 from .HgSummaryDialog import HgSummaryDialog
 self.summary = HgSummaryDialog(self)
 self.summary.show()
-self.summary.start(self.__projectHelper.getProject().getProjectPath(), mq=mq)
+self.summary.start(self.__projectHelper.getProject().getProjectPath(),
+mq=mq)
 def vcsTag(self, name):
 """
 Public method used to set the tag in the Mercurial repository.
 return False
 project = e5App().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
-from UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
+from UI.DeleteFilesConfirmationDialog import \
+DeleteFilesConfirmationDialog
 dlg = 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?"),
 names)
 yes = dlg.exec_() == QDialog.Accepted
 else:
 yes = E5MessageBox.yesNo(None,
 self.trUtf8("Revert changes"),
 if force:
 del opts[opts.index('--force')]
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
-self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+self.getExtensionObject("bookmarks")\
+.hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
 from .HgMergeDialog import HgMergeDialog
 dlg = HgMergeDialog(force, self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 dia.exec_()
 self.checkVCSStatus()
 def vcsSwitch(self, name):
 """
-Public method used to switch a working directory to a different revision.
+Public method used to switch a working directory to a different
+revision.
 @param name directory name to be switched (string)
 @return flag indicating, that the switch contained an add
 or delete (boolean)
 """
 if os.path.splitdrive(repodir)[1] == os.sep:
 return False
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
-self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+self.getExtensionObject("bookmarks")\
+.hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 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 have 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 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
 """
 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 (HgOptionsDialog)
 """
 from .HgOptionsDialog import HgOptionsDialog
 return HgOptionsDialog(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
+(HgNewProjectOptionsDialog)
 """
 from .HgNewProjectOptionsDialog import HgNewProjectOptionsDialog
 return HgNewProjectOptionsDialog(self, parent)
 def vcsRepositoryInfos(self, ppath):
 infoBlock = []
 if output:
 index = 0
 for line in output.splitlines():
 index += 1
-changeset, tags, author, date, branches, bookmarks = line.split("@@@")
+changeset, tags, author, date, branches, bookmarks = \
+line.split("@@@")
 cdate, ctime = date.split()[:2]
 info = []
 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>""")\
 """<tr><td><b>URL</b></td><td>{1}</td></tr>\n"""
 """{2}"""
 """</table></p>\n"""
 ).format(self.versionStr, url, infoStr)
-############################################################################
+###########################################################################
 ## Private Mercurial specific methods are below.
-############################################################################
+###########################################################################
 def __hgURL(self, url):
 """
 Private method to format a url for Mercurial.
 scheme, user, host, port, parse.quote(path))
 elif len(url) == 3:
 scheme = url[0]
 host = url[1]
 port, path = url[2].split("/", 1)
-return "{0}:{1}:{2}/{3}".format(scheme, host, port, parse.quote(path))
+return "{0}:{1}:{2}/{3}".format(
+scheme, host, port, parse.quote(path))
 else:
 scheme = url[0]
 if scheme == "file":
 return "{0}:{1}".format(scheme, parse.quote(url[1]))
 else:
 host, path = url[1][2:].split("/", 1)
-return "{0}://{1}/{2}".format(scheme, host, parse.quote(path))
+return "{0}://{1}/{2}".format(
+scheme, host, parse.quote(path))
 def hgNormalizeURL(self, url):
 """
 Public method to normalize a url for Mercurial.
 allTagsBranchesList = self.allTagsBranchesList
 else:
 self.branchesList = []
 allTagsBranchesList = None
 self.tagbranchList.start(path, tags,
-self.branchesList, self.allTagsBranchesList)
+self.branchesList,
+self.allTagsBranchesList)
 def hgAnnotate(self, name):
 """
 Public method to show the output of the hg annotate command.
 """
 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
+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)
 """
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
-self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+self.getExtensionObject("bookmarks")\
+.hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 self.diff.show()
 self.diff.start(name, revisions)
 def __hgGetFileForRevision(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 (string)
 @return contents of the file (string) and an error message (string)
 """
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
 error = str(process.readAllStandardError(),
 Preferences.getSystem("IOEncoding"), 'replace')
 else:
-error = self.trUtf8("The hg process did not finish within 30s.")
+error = self.trUtf8(
+"The hg process did not finish within 30s.")
 else:
 error = self.trUtf8('The process {0} could not be started. '
 'Ensure, that it is in the search path.').format('hg')
 else:
 output, error = self.__client.runcommand(args)
 return output, error
 def hgSbsDiff(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
 """
 if isinstance(name, list):
 raise ValueError("Wrong parameter type")
 if extended:
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
-self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+self.getExtensionObject("bookmarks")\
+.hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
 from .HgRevisionsSelectionDialog import HgRevisionsSelectionDialog
 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir),
 f1.close()
 name2 = name
 except IOError:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Mercurial 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
 """
 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)
-@keyparam isFile flag indicating log for a file is to be shown (boolean)
+@keyparam isFile flag indicating log for a file is to be shown
+(boolean)
 """
 from .HgLogBrowserDialog import HgLogBrowserDialog
 self.logBrowser = HgLogBrowserDialog(self, isFile=isFile)
 self.logBrowser.show()
 self.logBrowser.start(path)
 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
-dia = HgDialog(self.trUtf8('Pushing to a remote Mercurial repository'), self)
+dia = HgDialog(
+self.trUtf8('Pushing to a remote Mercurial repository'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
 self.checkVCSStatus()
 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)
+@keyparam mode mode of the operation (string, one of heads, parents,
+tip)
 """
 if mode not in ("heads", "parents", "tip"):
 mode = "heads"
 info = []
 # find the root of the repo
 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 False
+return
 dia = HgDialog(self.trUtf8('Resolving files/directories'), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 if ok and name:
 args = []
 args.append('branch')
 args.append(name.strip().replace(" ", "_"))
-dia = HgDialog(self.trUtf8('Creating branch in the Mercurial repository'),
+dia = HgDialog(
-self)
+self.trUtf8('Creating branch in the Mercurial repository'),
+self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgShowBranch(self, name):
 from .HgUtilities import getConfigPath
 cfgFile = getConfigPath()
 if not os.path.exists(cfgFile):
 try:
 f = open(cfgFile, "w")
-f.write("[ui]\nusername = Firstname Lastname <email_address>\n")
+f.write("[ui]\nusername = Firstname Lastname"
+" <email_address>\n")
 f.close()
 except (IOError, OSError):
 # ignore these
 pass
 self.userEditor = MiniEditor(cfgFile, "Properties")
 return
 args = []
 args.append('verify')
-dia = HgDialog(self.trUtf8('Verifying the integrity of the Mercurial repository'),
+dia = HgDialog(
-self)
+self.trUtf8('Verifying the integrity of the Mercurial repository'),
+self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgShowConfig(self, name):
 args = []
 args.append('showconfig')
 args.append("--untrusted")
-dia = HgDialog(self.trUtf8('Showing the combined configuration settings'), self)
+dia = HgDialog(
+self.trUtf8('Showing the combined configuration settings'),
+self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 def hgShowPaths(self, name):
 return
 args = []
 args.append('paths')
-dia = HgDialog(self.trUtf8('Showing aliases for remote repositories'), self)
+dia = HgDialog(
+self.trUtf8('Showing aliases for remote repositories'),
+self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 def hgRecover(self, name):
 return
 args = []
 args.append('recover')
-dia = HgDialog(self.trUtf8('Recovering from interrupted transaction'), self)
+dia = HgDialog(
+self.trUtf8('Recovering from interrupted transaction'),
+self)
 res = dia.startProcess(args, repodir, False)
 if res:
 dia.exec_()
 def hgIdentify(self, name):
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
-self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+self.getExtensionObject("bookmarks")\
+.hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
 from .HgBundleDialog import HgBundleDialog
 dlg = HgBundleDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 Public method to perform bisect commands.
 @param name file/directory name (string)
 @param subcommand name of the subcommand (string, one of 'good', 'bad',
 'skip' or 'reset')
+@exception ValueError raised to indicate an invalid bisect subcommand
 """
 if subcommand not in ("good", "bad", "skip", "reset"):
 raise ValueError(
-self.trUtf8("Bisect subcommand ({0}) invalid.").format(subcommand))
+self.trUtf8("Bisect subcommand ({0}) invalid.")
+.format(subcommand))
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 rev = ""
 if subcommand in ("good", "bad", "skip"):
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
-self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+self.getExtensionObject("bookmarks")\
+.hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
 from .HgRevisionSelectionDialog import HgRevisionSelectionDialog
 dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 args.append("bisect")
 args.append("--{0}".format(subcommand))
 if rev:
 args.append(rev)
-dia = HgDialog(self.trUtf8('Mercurial Bisect ({0})').format(subcommand), self)
+dia = HgDialog(
+self.trUtf8('Mercurial Bisect ({0})').format(subcommand), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 def hgForget(self, name):
 """
 Public method used to remove a file from the Mercurial repository.
 This will not remove the file from the project directory.
-@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
+strings))
 """
 args = []
 args.append('forget')
 self.addArguments(args, self.options['global'])
 args.append('-v')
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 dia = HgDialog(
-self.trUtf8('Removing files from the Mercurial repository only'), self)
+self.trUtf8('Removing files from the Mercurial repository only'),
+self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 if isinstance(name, list):
 self.__forgotNames.extend(name)
 else:
 self.__forgotNames.append(name)
 def hgBackout(self, name):
 """
-Public method used to backout an earlier changeset from the Mercurial repository.
+Public method used to backout an earlier changeset from the Mercurial
+repository.
 @param name directory name (string or list of strings)
 """
 dname, fname = self.splitPath(name)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 if self.isExtensionActive("bookmarks"):
 bookmarksList = \
-self.getExtensionObject("bookmarks").hgGetBookmarksList(repodir)
+self.getExtensionObject("bookmarks")\
+.hgGetBookmarksList(repodir)
 else:
 bookmarksList = None
 from .HgBackoutDialog import HgBackoutDialog
 dlg = HgBackoutDialog(self.hgGetTagsList(repodir),
 self.hgGetBranchesList(repodir),
 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
-res = E5MessageBox.yesNo(None,
+res = E5MessageBox.yesNo(
+None,
 self.trUtf8("Rollback last transaction"),
-self.trUtf8("""Are you sure you want to rollback the last transaction?"""),
+self.trUtf8("""Are you sure you want to rollback the last"""
+""" transaction?"""),
 icon=E5MessageBox.Warning)
 if res:
 dia = HgDialog(self.trUtf8('Rollback last transaction'), self)
 res = dia.startProcess(["rollback"], repodir)
 if res:
 @param name directory name of the project to export from (string)
 @param data tuple giving phase data (list of revisions, phase, flag
 indicating a forced operation) (list of strings, string, boolean)
 @return flag indicating success (boolean)
+@exception ValueError raised to indicate an invalid phase
 """
 dname, fname = self.splitPath(name)
 # find the root of the repo
 repodir = dname
 def hgGraft(self, path, revs=None):
 """
 Public method to copy changesets from another branch.
 @param path directory name of the project (string)
-@param revs list of revisions to show in the revisions pane (list of strings)
+@param revs list of revisions to show in the revisions pane (list of
+strings)
 @return flag indicating that the project should be reread (boolean)
 """
 # find the root of the repo
 repodir = self.splitPath(path)[0]
 while not os.path.isdir(os.path.join(repodir, self.adminDir)):
 dia = HgDialog(self.trUtf8("Create Unversioned Archive"), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
-############################################################################
+###########################################################################
 ## Methods to deal with subrepositories are below.
-############################################################################
+###########################################################################
 def getHgSubPath(self):
 """
-Public method to get the path to the .hgsub file containing the definitions
+Public method to get the path to the .hgsub file containing the
-of sub-repositories.
+definitions of sub-repositories.
 @return full path of the .hgsub file (string)
 """
 ppath = self.__projectHelper.getProject().getProjectPath()
 return os.path.join(ppath, ".hgsub")
 contents = f.readlines()
 f.close()
 except IOError as err:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Add Sub-repository"),
-self.trUtf8("""<p>The sub-repositories file .hgsub could not"""
+self.trUtf8(
-""" be read.</p><p>Reason: {0}</p>""")
+"""<p>The sub-repositories file .hgsub could not"""
-.format(str(err)))
+""" be read.</p><p>Reason: {0}</p>""")
+.format(str(err)))
 return
 if entry in contents:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Add Sub-repository"),
-self.trUtf8("""<p>The sub-repositories file .hgsub already"""
+self.trUtf8(
-""" contains an entry <b>{0}</b>. Aborting...</p>""")
+"""<p>The sub-repositories file .hgsub already"""
-.format(entry))
+""" contains an entry <b>{0}</b>."""
+""" Aborting...</p>""").format(entry))
 return
 else:
 needsAdd = True
 if contents and not contents[-1].endswith("\n"):
 f.writelines(contents)
 f.close()
 except IOError as err:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Add Sub-repository"),
-self.trUtf8("""<p>The sub-repositories file .hgsub could not"""
+self.trUtf8(
-""" be written to.</p><p>Reason: {0}</p>""")
+"""<p>The sub-repositories file .hgsub could not"""
-.format(str(err)))
+""" be written to.</p><p>Reason: {0}</p>""")
+.format(str(err)))
 return
 if needsAdd:
 self.vcsAdd(hgsub)
 self.__projectHelper.getProject().appendFile(hgsub)
 self.trUtf8("""<p>The sub-repositories file .hgsub could not"""
 """ be read.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 return
-from .HgRemoveSubrepositoriesDialog import HgRemoveSubrepositoriesDialog
+from .HgRemoveSubrepositoriesDialog import \
+HgRemoveSubrepositoriesDialog
 dlg = HgRemoveSubrepositoriesDialog(subrepositories)
 if dlg.exec_() == QDialog.Accepted:
 subrepositories, removedSubrepos, deleteSubrepos = dlg.getData()
 contents = "\n".join(subrepositories) + "\n"
 try:
 f.write(contents)
 f.close()
 except IOError as err:
 E5MessageBox.critical(self.__ui,
 self.trUtf8("Remove Sub-repositories"),
-self.trUtf8("""<p>The sub-repositories file .hgsub could not"""
+self.trUtf8(
-""" be written to.</p><p>Reason: {0}</p>""")
+"""<p>The sub-repositories file .hgsub could not"""
-.format(str(err)))
+""" be written to.</p><p>Reason: {0}</p>""")
+.format(str(err)))
 return
 if deleteSubrepos:
 ppath = self.__projectHelper.getProject().getProjectPath()
 for removedSubrepo in removedSubrepos:
 subrepoPath = removedSubrepo.split("=", 1)[0].strip()
 subrepoAbsPath = os.path.join(ppath, subrepoPath)
 shutil.rmtree(subrepoAbsPath, True)
-############################################################################
+###########################################################################
 ## Methods to handle extensions are below.
-############################################################################
+###########################################################################
 def __iniFileChanged(self, path):
 """
 Private slot to handle a change of the Mercurial configuration file.
 if self.__client:
 ok, err = self.__client.restartServer()
 if not ok:
 E5MessageBox.warning(None,
 self.trUtf8("Mercurial Command Server"),
-self.trUtf8("""<p>The Mercurial Command Server could not be"""
+self.trUtf8(
-""" restarted.</p><p>Reason: {0}</p>""").format(err))
+"""<p>The Mercurial Command Server could not be"""
+""" restarted.</p><p>Reason: {0}</p>""").format(err))
 self.__client = None
 def __monitorRepoIniFile(self, name):
 """
-Private slot to add a repository configuration file to the list of monitored
+Private slot to add a repository configuration file to the list of
-files.
+monitored files.
 @param name directory name pointing into the repository (string)
 """
 dname, fname = self.splitPath(name)
 else:
 output, error = self.__client.runcommand(args)
 if output:
 for line in output.splitlines():
-extensionName = line.split("=", 1)[0].strip().split(".")[-1].strip()
+extensionName = \
+line.split("=", 1)[0].strip().split(".")[-1].strip()
 self.__activeExtensions.append(extensionName)
 if self.version >= (1, 8):
 if "bookmarks" not in self.__activeExtensions:
 self.__activeExtensions.append("bookmarks")
 @param extensionName name of the extension to check for (string)
 @return flag indicating an active extension (boolean)
 """
 extensionName = extensionName.strip()
 isActive = extensionName in self.__activeExtensions
-if isActive and extensionName == "transplant" and self.version >= (2, 3):
+if isActive and \
+extensionName == "transplant" and \
+self.version >= (2, 3):
 # transplant extension is deprecated as of Mercurial 2.3.0
 isActive = False
 return isActive
 @param extensionName name of the extension (string)
 @return reference to the extension object (boolean)
 """
 return self.__extensions[extensionName]
-############################################################################
+###########################################################################
 ## 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 instantiate a helper object for the different project browsers.
+"""
+Public method to instantiate 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 HgProjectBrowserHelper
-return HgProjectBrowserHelper(self, browser, project, isTranslationsBrowser)
+return HgProjectBrowserHelper(self, browser, project,
+isTranslationsBrowser)
 def vcsGetProjectHelper(self, project):
 """
 Public method to instantiate a helper object for the project.
 if ok:
 self.__client = client
 else:
 E5MessageBox.warning(None,
 self.trUtf8("Mercurial Command Server"),
-self.trUtf8("""<p>The Mercurial Command Server could not be"""
+self.trUtf8(
-""" started.</p><p>Reason: {0}</p>""").format(err))
+"""<p>The Mercurial Command Server could not be"""
+""" started.</p><p>Reason: {0}</p>""").format(err))
 return self.__projectHelper
-############################################################################
+###########################################################################
 ##  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 (Project)
-@param interval check interval for the monitor thread in seconds (integer)
 @return reference to the monitor thread (QThread)
 """
 from .HgStatusMonitorThread import HgStatusMonitorThread
 return HgStatusMonitorThread(interval, project, self)

Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/hg.py

Plugins/VcsPlugins/vcsMercurial/hg.py