--- a/eric7/Plugins/VcsPlugins/vcsGit/git.py Mon Sep 20 19:47:18 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsGit/git.py Tue Sep 21 19:11:31 2021 +0200 @@ -669,6 +669,17 @@ return res + def vcsForget(self, name): + """ + Public method used to remove a file from the Mercurial repository. + + This will not remove the file from the project directory. + + @param name file/directory name to be removed + @type str or list of str + """ + self.vcsRemove(name, stageOnly=True) + def vcsMove(self, name, project, target=None, noDialog=False): """ Public method used to move a file/directory. @@ -845,13 +856,15 @@ return res - def gitRevert(self, name): + def vcsRevert(self, name): """ Public method used to revert changes made to a file/directory. - @param name file/directory name to be reverted (string) + @param name file/directory name to be reverted + @type str @return flag indicating, that the update contained an add - or delete (boolean) + or delete + @rtype bool """ args = self.initCommand("checkout") args.append("--") @@ -1568,7 +1581,7 @@ # return file contents with 'universal newlines' return output.replace('\r\n', '\n').replace('\r', '\n'), error - def gitSbsDiff(self, name, extended=False, revisions=None): + def vcsSbsDiff(self, name, extended=False, revisions=None): """ Public method used to view the difference of a file to the Git repository side-by-side.