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

-:4ef3b78ebb4e
+:c4d0cac9b5c9
 import os
 import shutil
-from PyQt5.QtCore import QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher, \
+from PyQt5.QtCore import (
-QCoreApplication
+QProcess, pyqtSignal, QFileInfo, QFileSystemWatcher, QCoreApplication
+)
 from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox, E5FileDialog
 for nam in nameList:
 # check for commit of the project
 if os.path.isdir(nam):
 project = e5App().getObject("Project")
 if nam == project.getProjectPath():
-ok &= \
+ok &= (
 project.checkAllScriptsDirty(
-reportSyntaxErrors=True) and \
+reportSyntaxErrors=True) and
 project.checkDirty()
+)
 continue
 elif os.path.isfile(nam):
-editor = \
+editor = (
 e5App().getObject("ViewManager").getOpenEditor(nam)
+)
 if editor:
 ok &= editor.checkDirty()
 if not ok:
 break
 repodir = os.path.dirname(repodir)
 if os.path.splitdrive(repodir)[1] == os.sep:
 return
 if self.__commitDialog is not None:
-msg, amend, commitSubrepositories, author, dateTime = \
+(msg, amend, commitSubrepositories, author,
-self.__commitDialog.getCommitData()
+dateTime) = self.__commitDialog.getCommitData()
 self.__commitDialog.deleteLater()
 self.__commitDialog = None
 if amend and not msg:
 msg = self.__getMostRecentCommitMessage(repodir)
 else:
 return False
 project = e5App().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
-from UI.DeleteFilesConfirmationDialog import \
+from UI.DeleteFilesConfirmationDialog import (
 DeleteFilesConfirmationDialog
+)
 dlg = DeleteFilesConfirmationDialog(
 self.parent(),
 self.tr("Revert changes"),
 self.tr(
 "Do you really want to revert all changes to these files"
 return
 project = e5App().getObject("Project")
 names = [project.getRelativePath(nam) for nam in names]
 if names[0]:
-from UI.DeleteFilesConfirmationDialog import \
+from UI.DeleteFilesConfirmationDialog import (
 DeleteFilesConfirmationDialog
+)
 dlg = DeleteFilesConfirmationDialog(
 self.parent(),
 self.tr("Re-Merge"),
 self.tr(
 "Do you really want to re-merge these files"
 infoBlock = []
 if output:
 index = 0
 for line in output.splitlines():
 index += 1
-changeset, tags, author, date, branches, bookmarks = \
+(changeset, tags, author, date, branches,
-line.split("@@@")
+bookmarks) = line.split("@@@")
 cdate, ctime = date.split()[:2]
 info = []
 info.append(QCoreApplication.translate(
 "mercurial",
 """<tr><td><b>Parent #{0}</b></td><td></td></tr>\n"""
 self.tr('Copying {0}').format(name), self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.normalExit()
-if res and \
+if (
-target.startswith(project.getProjectPath()):
+res and
+target.startswith(project.getProjectPath())
+):
 if os.path.isdir(name):
 project.copyDirectory(name, target)
 else:
 project.appendFile(target)
 return res
 @type list of str
 @return flag indicating, that the update contained an add
 or delete
 @rtype bool
 """
-if self.getPlugin().getPreferences("PreferUnbundle") and \
+if (
-self.bundleFile and \
+self.getPlugin().getPreferences("PreferUnbundle") and
-os.path.exists(self.bundleFile) and \
+self.bundleFile and
-revisions is None:
+os.path.exists(self.bundleFile) and
+revisions is None
+):
 command = "unbundle"
 title = self.tr('Apply changegroups')
 else:
 command = "pull"
 title = self.tr('Pulling from a remote Mercurial repository')
 dia = HgDialog(title, self)
 res = dia.startProcess(args, repodir)
 if res:
 dia.exec_()
 res = dia.hasAddOrDelete()
-if self.bundleFile and \
+if (
-os.path.exists(self.bundleFile):
+self.bundleFile and
+os.path.exists(self.bundleFile)
+):
 os.remove(self.bundleFile)
 self.bundleFile = None
 self.checkVCSStatus()
 return res
 if output:
 index = 0
 for line in output.splitlines():
 index += 1
-changeset, tags, author, date, branches, parents, bookmarks = \
+(changeset, tags, author, date, branches, parents,
-line.split("@@@")
+bookmarks) = line.split("@@@")
 cdate, ctime = date.split()[:2]
 info.append("""<p><table>""")
 if mode == "heads":
 info.append(QCoreApplication.translate(
 "mercurial",
 if defaultUrl:
 cfg.write("default = {0}\n".format(defaultUrl))
 if defaultPushUrl:
 cfg.write("default-push = {0}\n".format(
 defaultPushUrl))
-if withLargefiles and \
+if (
-(lfMinSize, lfPattern) != (None, None):
+withLargefiles and
+(lfMinSize, lfPattern) != (None, None)
+):
 cfg.write("\n[largefiles]\n")
 if lfMinSize is not None:
 cfg.write("minsize = {0}\n".format(lfMinSize))
 if lfPattern is not None:
 cfg.write("patterns =\n")
 if file:
 self.__lastChangeGroupPath = os.path.dirname(file)
 if self.logBrowserIncoming is None:
 from .HgLogBrowserDialog import HgLogBrowserDialog
-self.logBrowserIncoming = \
+self.logBrowserIncoming = HgLogBrowserDialog(
-HgLogBrowserDialog(self, mode="incoming")
+self, mode="incoming")
 self.logBrowserIncoming.show()
 self.logBrowserIncoming.raise_()
 self.logBrowserIncoming.start(name, bundle=file)
 def hgUnbundle(self, name, files=None):
 return False
 from .HgImportDialog import HgImportDialog
 dlg = HgImportDialog()
 if dlg.exec_() == QDialog.Accepted:
-patchFile, noCommit, message, date, user, stripCount, force = \
+(patchFile, noCommit, message, date, user, stripCount,
-dlg.getParameters()
+force) = dlg.getParameters()
 args = self.initCommand("import")
 args.append("--verbose")
 if noCommit:
 args.append("--no-commit")
 from .HgExportDialog import HgExportDialog
 dlg = HgExportDialog(self.hgGetBookmarksList(repodir),
 self.version >= (4, 7, 0))
 if dlg.exec_() == QDialog.Accepted:
-filePattern, revisions, bookmark, switchParent, allText, noDates, \
+(filePattern, revisions, bookmark, switchParent, allText,
-git = dlg.getParameters()
+noDates, git) = dlg.getParameters()
 args = self.initCommand("export")
 args.append("--output")
 args.append(filePattern)
 args.append("--verbose")
 from .HgGraftDialog import HgGraftDialog
 res = False
 dlg = HgGraftDialog(self, revs)
 if dlg.exec_() == QDialog.Accepted:
-revs, (userData, currentUser, userName), \
+(revs,
-(dateData, currentDate, dateStr), log, dryrun, \
+(userData, currentUser, userName),
-noCommit = dlg.getData()
+(dateData, currentDate, dateStr),
+log, dryrun, noCommit) = dlg.getData()
 args = self.initCommand("graft")
 args.append("--verbose")
 if userData:
 if currentUser:
 self.tr("""<p>The sub-repositories file .hgsub could not"""
 """ be read.</p><p>Reason: {0}</p>""")
 .format(str(err)))
 return
-from .HgRemoveSubrepositoriesDialog import \
+from .HgRemoveSubrepositoriesDialog import (
 HgRemoveSubrepositoriesDialog
+)
 dlg = HgRemoveSubrepositoriesDialog(subrepositories)
 if dlg.exec_() == QDialog.Accepted:
 subrepositories, removedSubrepos, deleteSubrepos = dlg.getData()
 contents = "\n".join(subrepositories) + "\n"
 try:
 self.__defaultConfigured = False
 self.__defaultPushConfigured = False
 if output:
 for line in output.splitlines():
-if line.startswith("paths.default=") and \
+if (
-not line.strip().endswith("="):
+line.startswith("paths.default=") and
+not line.strip().endswith("=")
+):
 self.__defaultConfigured = True
-if line.startswith("paths.default-push=") and \
+if (
-not line.strip().endswith("="):
+line.startswith("paths.default-push=") and
+not line.strip().endswith("=")
+):
 self.__defaultPushConfigured = True
 def canCommitMerge(self, name):
 """
 Public method to check, if the working directory is an uncommitted
 else:
 output, error = self.__client.runcommand(args)
 if output:
 for line in output.splitlines():
-extensionName = \
+extensionName = (
 line.split("=", 1)[0].strip().split(".")[-1].strip()
+)
 self.__activeExtensions.append(extensionName)
 if self.version < (4, 8, 0) and "closehead" in self.__activeExtensions:
 self.__activeExtensions.remove["closehead"]
 if activeExtensions != sorted(self.__activeExtensions):

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsMercurial/hg.py