--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Apr 11 16:53:48 2021 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Apr 11 18:45:10 2021 +0200 @@ -826,10 +826,13 @@ msgPart = "global " if tagOp in [HgTagDialog.DeleteGlobalTag, HgTagDialog.DeleteLocalTag]: args.append('--remove') - if tagOp in [HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag]: - if revision: - args.append("--rev") - args.append(revision) + if ( + tagOp in [ + HgTagDialog.CreateGlobalTag, HgTagDialog.CreateLocalTag] and + revision + ): + args.append("--rev") + args.append(revision) if force: args.append("--force") args.append('--message') @@ -1078,18 +1081,17 @@ flag, path = line.split(" ", 1) name = os.path.normcase(os.path.join(repoPath, path)) dirName = os.path.dirname(name) - if name.startswith(dname): - if flag not in "?I": - if name in names: - names[name] = self.canBeCommitted - if dirName in names: - names[dirName] = self.canBeCommitted - if dirs: - for d in dirs: - if name.startswith(d): - names[d] = self.canBeCommitted - dirs.remove(d) - break + if name.startswith(dname) and flag not in "?I": + if name in names: + names[name] = self.canBeCommitted + if dirName in names: + names[dirName] = self.canBeCommitted + if dirs: + for d in dirs: + if name.startswith(d): + names[d] = self.canBeCommitted + dirs.remove(d) + break if flag not in "?I": self.statusCache[name] = self.canBeCommitted self.statusCache[dirName] = self.canBeCommitted