diff -r e9e7eca7efee -r bf71ee032bb4 src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Wed Jul 13 11:16:20 2022 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py Wed Jul 13 14:55:47 2022 +0200
@@ -14,23 +14,24 @@
"""
Class implementing the VCS status monitor thread class for Mercurial.
"""
+
def __init__(self, interval, project, vcs, parent=None):
"""
Constructor
-
+
@param interval new interval in seconds (integer)
@param project reference to the project object (Project)
@param vcs reference to the version control object
@param parent reference to the parent object (QObject)
"""
VcsStatusMonitorThread.__init__(self, interval, project, vcs, parent)
-
+
self.__client = None
-
+
def _performMonitor(self):
"""
Protected method implementing the monitoring action.
-
+
This method populates the statusList member variable with a list of
strings giving the status in the first column and the path relative
to the project directory starting with the third column. The allowed
@@ -46,29 +47,29 @@
<li>"!" path is missing</li>
<li>" " path is back at normal</li>
</ul>
-
+
@return tuple of flag indicating successful operation and a status
message in case of non successful operation
@rtype tuple of (bool, str)
"""
self.shouldUpdate = False
-
+
ok, err = self.__initClient()
if not ok:
return False, err
-
+
# step 1: get overall status
args = self.vcs.initCommand("status")
- args.append('--noninteractive')
- args.append('--all')
+ args.append("--noninteractive")
+ args.append("--all")
if self.vcs.hasSubrepositories():
args.append("--subrepos")
-
+
output, error = self.__client.runcommand(args)
-
+
if error:
return False, error
-
+
states = {}
for line in output.splitlines():
if not line.startswith(" "):
@@ -79,67 +80,64 @@
else:
status = flag
states[name] = status
-
+
# step 2: get conflicting changes
args = self.vcs.initCommand("resolve")
- args.append('--list')
-
+ args.append("--list")
+
output, error = self.__client.runcommand(args)
-
+
for line in output.splitlines():
flag, name = line.split(" ", 1)
if flag == "U":
states[name] = "Z" # conflict
-
+
# step 3: collect the status to be reported back
for name in states:
try:
if self.reportedStates[name] != states[name]:
- self.statusList.append(
- "{0} {1}".format(states[name], name))
+ self.statusList.append("{0} {1}".format(states[name], name))
except KeyError:
self.statusList.append("{0} {1}".format(states[name], name))
for name in self.reportedStates:
if name not in states:
self.statusList.append(" {0}".format(name))
self.reportedStates = states
-
- return (
- True,
- self.tr("Mercurial status checked successfully")
- )
-
+
+ return (True, self.tr("Mercurial status checked successfully"))
+
def _getInfo(self):
"""
Protected method implementing the real info action.
-
+
@return short info message
@rtype str
"""
ok, err = self.__initClient()
if not ok:
return ""
-
+
args = self.vcs.initCommand("identify")
- args.append('--num')
- args.append('--id')
- args.append('--branch')
-
+ args.append("--num")
+ args.append("--id")
+ args.append("--branch")
+
output, error = self.__client.runcommand(args)
-
+
if error:
# ignore errors
return ""
-
+
globalRev, localRev, branch = output.splitlines()[0].split(None, 2)
if globalRev.endswith("+"):
globalRev = globalRev[:-1]
if localRev.endswith("+"):
localRev = localRev[:-1]
-
+
return self.tr("{0} / {1}:{2}", "branch, local id, global id").format(
- branch, localRev, globalRev)
-
+ branch, localRev, globalRev
+ )
+
def _shutdown(self):
"""
Protected method performing shutdown actions.
@@ -150,12 +148,13 @@
def __initClient(self):
"""
Private method to initialize the Mercurial client.
-
+
@return tuple containing an OK flag and potentially an error message
@rtype tuple of (bool, str)
"""
if self.__client is None:
from .HgClient import HgClient
+
client = HgClient(self.projectDir, "utf-8", self.vcs)
ok, err = client.startServer()
if ok:
@@ -163,5 +162,5 @@
else:
ok = True
err = ""
-
+
return ok, err
