Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Wed Apr 21 17:56:12 2021 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py	Wed Apr 21 19:40:50 2021 +0200
@@ -1244,10 +1244,11 @@
                     """<tr><td><b>Committed time</b></td><td>{2}</td></tr>""")
                     .format(author, cdate, ctime))
                 infoBlock.append("\n".join(info))
-        if infoBlock:
-            infoStr = """<tr></tr>{0}""".format("<tr></tr>".join(infoBlock))
-        else:
-            infoStr = ""
+        infoStr = (
+            """<tr></tr>{0}""".format("<tr></tr>".join(infoBlock))
+            if infoBlock else
+            ""
+        )
         
         url = ""
         args = self.initCommand("showconfig")
@@ -1780,10 +1781,11 @@
         else:
             args.append(name)
         
-        if unresolve:
-            title = self.tr("Marking as 'unresolved'")
-        else:
-            title = self.tr("Marking as 'resolved'")
+        title = (
+            self.tr("Marking as 'unresolved'")
+            if unresolve else
+            self.tr("Marking as 'resolved'")
+        )
         dia = HgDialog(title, self)
         res = dia.startProcess(args)
         if res:
@@ -2018,15 +2020,16 @@
         ]
         
         ignoreName = os.path.join(name, Hg.IgnoreFileName)
-        if os.path.exists(ignoreName):
-            res = E5MessageBox.yesNo(
+        res = (
+            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:
-            res = True
+            if os.path.exists(ignoreName) else
+            True
+        )
         if res:
             try:
                 # create a .hgignore file
@@ -3160,10 +3163,11 @@
         """
         bookmarksList = []
         
-        if incoming:
-            args = self.initCommand("incoming")
-        else:
-            args = self.initCommand("outgoing")
+        args = (
+            self.initCommand("incoming")
+            if incoming else
+            self.initCommand("outgoing")
+        )
         args.append('--bookmarks')
         
         client = self.getClient()