diff -r 84f7f7867b5f -r 8c9f41115c04 eric7/VCS/VersionControl.py
--- a/eric7/VCS/VersionControl.py Mon Sep 20 19:47:18 2021 +0200
+++ b/eric7/VCS/VersionControl.py Tue Sep 21 19:11:31 2021 +0200
@@ -302,7 +302,23 @@
implemented by a subclass
"""
raise RuntimeError('Not implemented')
+
+ def vcsSbsDiff(self, name, extended=False, revisions=None):
+ """
+ Public method used to view the difference of a file to the Mercurial
+ repository side-by-side.
+ @param name file name to be diffed
+ @type str
+ @param extended flag indicating the extended variant
+ @type bool
+ @param revisions tuple of two revisions
+ @type tuple of two str
+ @exception RuntimeError to indicate that this method must be
+ implemented by a subclass
+ """
+ raise RuntimeError('Not implemented')
+
def vcsStatus(self, name):
"""
Public method used to view the status of a file/directory in the vcs.
@@ -327,12 +343,29 @@
"""
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
+ @rtype bool
@exception RuntimeError to indicate that this method must be
implemented by a subclass
"""
raise RuntimeError('Not implemented')
+ return False
+
+ def vcsForget(self, name):
+ """
+ Public method used to remove a file from the repository.
+
+ @param name file/directory name to be removed
+ @type str or list of str
+ @exception RuntimeError to indicate that this method must be
+ implemented by a subclass
+ """
+ raise RuntimeError('Not implemented')
+
def vcsSwitch(self, name):
"""
Public method used to switch a directory to a different tag/branch.
@@ -579,7 +612,17 @@
for key in self.interestingDataKeys:
if key in dictionary:
self.otherData[key] = dictionary[key]
+
+ def vcsResolved(self, name):
+ """
+ Public method used to resolve conflicts of a file/directory.
+ @param name file/directory name to be resolved
+ @type str
+ """
+ # default implementation just refreshes the status
+ self.checkVCSStatus()
+
#####################################################################
## below are some utility methods
#####################################################################
