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

-:fb0ef164f536
+:698ae46f40a4
 Module implementing the version control systems interface to Mercurial.
 """
 import os
 import shutil
+import contextlib
 from PyQt5.QtCore import (
 pyqtSignal, QFileInfo, QFileSystemWatcher, QCoreApplication
 )
 from PyQt5.QtWidgets import QApplication, QDialog, QInputDialog
 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[:] if isinstance(name, list) else [name]
-names = name[:]
-else:
-names = [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = e5App().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 return
 msgPart = "local "
 else:
 msgPart = "global "
 if tagOp in [HgTagDialog.DeleteGlobalTag, HgTagDialog.DeleteLocalTag]:
 args.append('--remove')
-if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]:
+if (
-if revision:
+tagOp in [
-args.append("--rev")
+HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag] and
-args.append(revision)
+revision
+):
+args.append("--rev")
+args.append(revision)
 if force:
 args.append("--force")
 args.append('--message')
 if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]:
 tag = tag.strip().replace(" ", "_")
 for line in output.splitlines():
 if line and line[0] in "MARC!?I":
 flag, path = line.split(" ", 1)
 name = os.path.normcase(os.path.join(repoPath, path))
 dirName = os.path.dirname(name)
-if name.startswith(dname):
+if name.startswith(dname) and flag not in "?I":
-if flag not in "?I":
+if name in names:
-if name in names:
+names[name] = self.canBeCommitted
-names[name] = self.canBeCommitted
+if dirName in names:
-if dirName in names:
+names[dirName] = self.canBeCommitted
-names[dirName] = self.canBeCommitted
+if dirs:
-if dirs:
+for d in dirs:
-for d in dirs:
+if name.startswith(d):
-if name.startswith(d):
+names[d] = self.canBeCommitted
-names[d] = self.canBeCommitted
+dirs.remove(d)
-dirs.remove(d)
+break
-break
 if flag not in "?I":
 self.statusCache[name] = self.canBeCommitted
 self.statusCache[dirName] = self.canBeCommitted
 else:
 self.statusCache[name] = self.canBeAdded
 entries = []
 for pat in patterns:
 entries.extend(Utilities.direntries(name, True, pat))
 for entry in entries:
-try:
+with contextlib.suppress(OSError):
 os.remove(entry)
-except OSError:
-pass
 def vcsCommandLine(self, name):
 """
 Public method used to execute arbitrary mercurial commands.
 output, error = self.__client.runcommand(args)
 infoBlock = []
 if output:
-index = 0
+for index, line in enumerate(output.splitlines(), start=1):
-for line in output.splitlines():
-index += 1
 (changeset, tags, author, date, branches,
 bookmarks) = line.split("@@@")
 cdate, ctime = date.split()[:2]
 info = []
 info.append(QCoreApplication.translate(
 """<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))
 infoBlock.append("\n".join(info))
-if infoBlock:
+infoStr = (
-infoStr = """<tr></tr>{0}""".format("<tr></tr>".join(infoBlock))
+"""<tr></tr>{0}""".format("<tr></tr>".join(infoBlock))
-else:
+if infoBlock else
-infoStr = ""
+""
+)
 url = ""
 args = self.initCommand("showconfig")
 args.append('paths.default')
 output, error = self.__client.runcommand(args)
+url = output.splitlines()[0].strip() if output else ""
-if output:
-url = output.splitlines()[0].strip()
-else:
-url = ""
 return QCoreApplication.translate(
 'mercurial',
 """<h3>Repository information</h3>\n"""
 """<p><table>\n"""
 This method gives the chance to enter the revisions to be compared.
 @param name file/directory name to be diffed (string)
 """
-if isinstance(name, list):
+names = name[:] if isinstance(name, list) else [name]
-names = name[:]
-else:
-names = [name]
 for nam in names:
 if os.path.isfile(nam):
 editor = e5App().getObject("ViewManager").getOpenEditor(nam)
 if editor and not editor.checkDirty():
 return
 '{date|isodate}@@@{branches}@@@{parents}@@@{bookmarks}\n')
 output, error = self.__client.runcommand(args)
 if output:
-index = 0
+for index, line in enumerate(output.splitlines(), start=1):
-for line in output.splitlines():
-index += 1
 (changeset, tags, author, date, branches, parents,
 bookmarks) = line.split("@@@")
 cdate, ctime = date.split()[:2]
 info.append("""<p><table>""")
 if mode == "heads":
 if isinstance(name, list):
 self.addArguments(args, name)
 else:
 args.append(name)
-if unresolve:
+title = (
-title = self.tr("Marking as 'unresolved'")
+self.tr("Marking as 'unresolved'")
-else:
+if unresolve else
-title = self.tr("Marking as 'resolved'")
+self.tr("Marking as 'resolved'")
+)
 dia = HgDialog(title, self)
 res = dia.startProcess(args)
 if res:
 dia.exec()
 self.checkVCSStatus()
 defaultUrl, defaultPushUrl = dlg.getData()
 if withLargefiles:
 lfMinSize, lfPattern = dlg.getLargefilesData()
 else:
 createContents = False
-try:
+with contextlib.suppress(OSError):
 with open(cfgFile, "w") as cfg:
 if createContents:
 # write the data entered
 cfg.write("[paths]\n")
 if defaultUrl:
 cfg.write("patterns =\n")
 cfg.write("  {0}\n".format(
 "\n  ".join(lfPattern)))
 self.__monitorRepoIniFile(repoName)
 self.__iniFileChanged(cfgFile)
-except OSError:
-pass
 self.repoEditor = MiniEditor(cfgFile, "Properties")
 self.repoEditor.show()
 def hgVerify(self):
 """
 "glob:__pycache__",
 "glob:**.DS_Store",
 ]
 ignoreName = os.path.join(name, Hg.IgnoreFileName)
-if os.path.exists(ignoreName):
+res = (
-res = E5MessageBox.yesNo(
+E5MessageBox.yesNo(
 self.__ui,
 self.tr("Create .hgignore file"),
 self.tr("""<p>The file <b>{0}</b> exists already."""
 """ Overwrite it?</p>""").format(ignoreName),
 icon=E5MessageBox.Warning)
-else:
+if os.path.exists(ignoreName) else
-res = True
+True
+)
 if res:
 try:
 # create a .hgignore file
 with open(ignoreName, "w") as ignore:
 ignore.write("\n".join(ignorePatterns))
 data = dlg.getData()
 if data:
 revs, phase, force = data
+if phase not in ("p", "d", "s"):
+raise ValueError("Invalid phase given.")
 args = self.initCommand("phase")
 if phase == "p":
 args.append("--public")
 elif phase == "d":
 args.append("--draft")
-elif phase == "s":
+else:
 args.append("--secret")
-else:
-raise ValueError("Invalid phase given.")
 if force:
 args.append("--force")
 for rev in revs:
 args.append(rev)
 @param incoming flag indicating to get incoming bookmarks (boolean)
 @return list of bookmarks (list of string)
 """
 bookmarksList = []
-if incoming:
+args = (
-args = self.initCommand("incoming")
+self.initCommand("incoming")
-else:
+if incoming else
-args = self.initCommand("outgoing")
+self.initCommand("outgoing")
+)
 args.append('--bookmarks')
 client = self.getClient()
 output = client.runcommand(args)[0]

Mercurial Repositories > eric / file comparison

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

eric6/Plugins/VcsPlugins/vcsMercurial/hg.py