Mercurial Repositories > eric / file diff

diff: src/eric7/Documentation/Source/eric7.VCS.VersionControl.html

src/eric7/Documentation/Source/eric7.VCS.VersionControl.html

branch
eric7
changeset 10070
9f5758c0fec1
parent 9209
b99e7fd55fd3
child 10259
b51dfacef37f
--- a/src/eric7/Documentation/Source/eric7.VCS.VersionControl.html	Thu May 25 19:51:47 2023 +0200
+++ b/src/eric7/Documentation/Source/eric7.VCS.VersionControl.html	Thu May 25 19:52:31 2023 +0200
@@ -114,7 +114,7 @@
 </tr>
 <tr>
 <td><a href="#VersionControl._createStatusMonitorThread">_createStatusMonitorThread</a></td>
-<td>Protected method to create an instance of the VCS status monitor thread.</td>
+<td></td>
 </tr>
 <tr>
 <td><a href="#VersionControl._vcsAddProjectCommitMessage">_vcsAddProjectCommitMessage</a></td>
@@ -310,7 +310,7 @@
 </tr>
 <tr>
 <td><a href="#VersionControl.vcsResolved">vcsResolved</a></td>
-<td>Public method used to resolve conflicts of a file/directory.</td>
+<td></td>
 </tr>
 <tr>
 <td><a href="#VersionControl.vcsRevert">vcsRevert</a></td>
@@ -461,32 +461,6 @@
 <h4>VersionControl._createStatusMonitorThread</h4>
 <b>_createStatusMonitorThread</b>(<i>interval, project</i>)
 
-<p>
-        Protected method to create an instance of the VCS status monitor
-        thread.
-</p>
-<p>
-        Note: This method should be overwritten in subclasses in order to
-        support VCS status monitoring.
-</p>
-<dl>
-
-<dt><i>interval</i></dt>
-<dd>
-check interval for the monitor thread in seconds
-            (integer)
-</dd>
-<dt><i>project</i></dt>
-<dd>
-reference to the project object
-</dd>
-</dl>
-<dl>
-<dt>Return:</dt>
-<dd>
-reference to the monitor thread (QThread)
-</dd>
-</dl>
 <a NAME="VersionControl._vcsAddProjectCommitMessage" ID="VersionControl._vcsAddProjectCommitMessage"></a>
 <h4>VersionControl._vcsAddProjectCommitMessage</h4>
 <b>_vcsAddProjectCommitMessage</b>(<i>message</i>)
@@ -785,7 +759,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -811,7 +785,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -833,7 +807,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -855,7 +829,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -889,7 +863,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -925,7 +899,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -947,7 +921,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -962,7 +936,7 @@
 </p>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -984,7 +958,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1021,7 +995,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1048,7 +1022,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1079,7 +1053,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1101,7 +1075,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1123,7 +1097,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1155,7 +1129,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1177,7 +1151,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1242,7 +1216,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1270,7 +1244,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1317,7 +1291,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1349,7 +1323,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1395,7 +1369,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1417,7 +1391,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1457,7 +1431,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1478,7 +1452,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1501,7 +1475,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1536,7 +1510,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1565,7 +1539,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1601,7 +1575,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1629,7 +1603,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1639,16 +1613,6 @@
 <h4>VersionControl.vcsResolved</h4>
 <b>vcsResolved</b>(<i>name</i>)
 
-<p>
-        Public method used to resolve conflicts of a file/directory.
-</p>
-<dl>
-
-<dt><i>name</i> (str)</dt>
-<dd>
-file/directory name to be resolved
-</dd>
-</dl>
 <a NAME="VersionControl.vcsRevert" ID="VersionControl.vcsRevert"></a>
 <h4>VersionControl.vcsRevert</h4>
 <b>vcsRevert</b>(<i>name</i>)
@@ -1678,7 +1642,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1709,7 +1673,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1785,7 +1749,7 @@
 </p>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1807,7 +1771,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1850,7 +1814,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1872,7 +1836,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass
@@ -1905,7 +1869,7 @@
 </dl>
 <dl>
 
-<dt>Raises <b>RuntimeError</b>:</dt>
+<dt>Raises <b>NotImplementedError</b>:</dt>
 <dd>
 to indicate that this method must be
             implemented by a subclass

Mercurial Repository: eric

eric ide

mercurial