diff -r 527d47826e97 -r acabc60b19a2 src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Jan 08 11:14:48 2024 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Jan 08 11:50:27 2024 +0100
@@ -21,7 +21,7 @@
from eric7.QScintilla.MiniEditor import MiniEditor
from eric7.SystemUtilities import FileSystemUtilities
from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
-from eric7.VCS.VersionControl import VersionControl
+from eric7.VCS.VersionControl import VersionControl, VersionControlState
from .HgClient import HgClient
from .HgDialog import HgDialog
@@ -1098,15 +1098,15 @@
@param name file or directory name to check
@type str
- @return registered state (one of canBeCommited and canBeAdded)
- @rtype int
+ @return registered state
+ @rtype VersionControlState
"""
if name.endswith(os.sep):
name = name[:-1]
name = os.path.normcase(name)
if os.path.isdir(name) and os.path.isdir(os.path.join(name, self.adminDir)):
- return self.canBeCommitted
+ return VersionControlState.Controlled
if name in self.statusCache:
return self.statusCache[name]
@@ -1125,9 +1125,9 @@
os.path.join(repodir, path)
)
if flag not in "?I" and absname == name:
- return self.canBeCommitted
-
- return self.canBeAdded
+ return VersionControlState.Controlled
+
+ return VersionControlState.Uncontrolled
def vcsAllRegisteredStates(self, names, dname, shortcut=True): # noqa: U100
"""
@@ -1144,8 +1144,8 @@
@type str
@param shortcut flag indicating a shortcut should be taken
@type bool
- @return the received dictionary completed with a combination of
- canBeCommited and canBeAdded or None in order to signal an error
+ @return the received dictionary completed with the VCS state or None in
+ order to signal an error
@rtype dict
"""
if dname.endswith(os.sep):
@@ -1175,22 +1175,24 @@
dirName = os.path.dirname(name)
if name.startswith(dname) and flag not in "?I":
if name in names:
- names[name] = self.canBeCommitted
+ names[name] = VersionControlState.Controlled
if dirName in names:
- names[dirName] = self.canBeCommitted
+ names[dirName] = VersionControlState.Controlled
if dirs:
for d in dirs:
if name.startswith(d):
- names[d] = self.canBeCommitted
+ names[d] = VersionControlState.Controlled
dirs.remove(d)
break
if flag not in "?I":
- self.statusCache[name] = self.canBeCommitted
- self.statusCache[dirName] = self.canBeCommitted
+ self.statusCache[name] = VersionControlState.Controlled
+ self.statusCache[dirName] = VersionControlState.Controlled
else:
- self.statusCache[name] = self.canBeAdded
+ self.statusCache[name] = VersionControlState.Uncontrolled
if dirName not in self.statusCache:
- self.statusCache[dirName] = self.canBeAdded
+ self.statusCache[
+ dirName
+ ] = VersionControlState.Uncontrolled
return names
