diff -r 1444b4bee64b -r 093dcebe5ecb src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Dec 03 16:44:52 2023 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Dec 03 19:46:34 2023 +0100
@@ -1007,9 +1007,7 @@
dlg = DeleteFilesConfirmationDialog(
self.parent(),
self.tr("Re-Merge"),
- self.tr(
- "Do you really want to re-merge these files or directories?"
- ),
+ self.tr("Do you really want to re-merge these files or directories?"),
names,
)
yes = dlg.exec() == QDialog.DialogCode.Accepted
@@ -1106,7 +1104,7 @@
dname = os.path.normcase(dname)
found = False
- for name in list(self.statusCache.keys()):
+ for name in self.statusCache:
if name in names:
found = True
names[name] = self.statusCache[name]
@@ -1120,7 +1118,7 @@
if output:
repoPath = self.getClient().getRepository()
- dirs = [x for x in names.keys() if os.path.isdir(x)]
+ dirs = [x for x in names if os.path.isdir(x)]
for line in output.splitlines():
if line and line[0] in "MARC!?I":
flag, path = line.split(" ", 1)
