--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue Jan 12 20:03:30 2021 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Wed Jan 13 17:46:13 2021 +0100 @@ -79,18 +79,21 @@ elif button == self.buttonBox.button(QDialogButtonBox.Cancel): self.vcs.getClient().cancel() - # TODO: workingDir is obsolete - def startProcess(self, args, workingDir=None, showArgs=True, - environment=None): + def startProcess(self, args, showArgs=True, environment=None, client=None): """ Public slot used to start the process. - @param args list of arguments for the process (list of strings) - @param workingDir working directory for the process (string) - @param showArgs flag indicating to show the arguments (boolean) + @param args list of arguments for the process + @type list of str + @param showArgs flag indicating to show the arguments + @type bool @param environment dictionary of environment settings to add - or change for the git process (dict of string and string) + or change for the git process + @type dict + @param client reference to a non-standard command client + @type HgClient @return flag indicating a successful start of the process + @rtype bool """ self.errorGroup.hide() self.inputGroup.hide() @@ -112,7 +115,9 @@ self.resultbox.append(' '.join(args)) self.resultbox.append('') - out, err = self.vcs.getClient().runcommand( + if client is None: + client = self.vcs.getClient() + out, err = client.runcommand( args, prompt=self.__getInput, output=self.__showOutput,