diff -r 68256afbba26 -r d2036d7f5ef6 eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html --- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sat May 04 12:04:12 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgLogBrowserDialog.html Sun Jun 02 11:42:48 2019 +0200 @@ -81,6 +81,9 @@ <td><a href="#HgLogBrowserDialog.__bundleActTriggered">__bundleActTriggered</a></td> <td>Private slot to create a changegroup file.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__closeHeadsActTriggered">__closeHeadsActTriggered</a></td> +<td>Private slot to close the selected head revisions.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__fetchActTriggered">__fetchActTriggered</a></td> <td>Private slot to fetch changes from a remote repository.</td> </tr><tr> @@ -117,6 +120,9 @@ <td><a href="#HgLogBrowserDialog.__getColor">__getColor</a></td> <td>Private method to get the (rotating) name of the color given an index.</td> </tr><tr> +<td><a href="#HgLogBrowserDialog.__getHeads">__getHeads</a></td> +<td>Private method to get the list of all heads.</td> +</tr><tr> <td><a href="#HgLogBrowserDialog.__getLogEntries">__getLogEntries</a></td> <td>Private method to retrieve log entries from the repository.</td> </tr><tr> @@ -325,19 +331,19 @@ </table> <a NAME="HgLogBrowserDialog.__init__" ID="HgLogBrowserDialog.__init__"></a> <h4>HgLogBrowserDialog (Constructor)</h4> -<b>HgLogBrowserDialog</b>(<i>vcs, mode="log", parent=None</i>) +<b>HgLogBrowserDialog</b>(<i>vcs, mode="", parent=None</i>) <p> Constructor </p><dl> -<dt><i>vcs</i></dt> +<dt><i>vcs</i> (Hg)</dt> <dd> reference to the vcs object -</dd><dt><i>mode</i></dt> +</dd><dt><i>mode</i> (str (one of log, full_log, incoming, outgoing))</dt> <dd> -mode of the dialog (string; one of log, incoming, outgoing) -</dd><dt><i>parent</i></dt> +mode of the dialog +</dd><dt><i>parent</i> (QWidget)</dt> <dd> -parent widget (QWidget) +parent widget </dd> </dl><a NAME="HgLogBrowserDialog.__actionMode" ID="HgLogBrowserDialog.__actionMode"></a> <h4>HgLogBrowserDialog.__actionMode</h4> @@ -402,6 +408,11 @@ <b>__bundleActTriggered</b>(<i></i>) <p> Private slot to create a changegroup file. +</p><a NAME="HgLogBrowserDialog.__closeHeadsActTriggered" ID="HgLogBrowserDialog.__closeHeadsActTriggered"></a> +<h4>HgLogBrowserDialog.__closeHeadsActTriggered</h4> +<b>__closeHeadsActTriggered</b>(<i></i>) +<p> + Private slot to close the selected head revisions. </p><a NAME="HgLogBrowserDialog.__fetchActTriggered" ID="HgLogBrowserDialog.__fetchActTriggered"></a> <h4>HgLogBrowserDialog.__fetchActTriggered</h4> <b>__fetchActTriggered</b>(<i></i>) @@ -485,41 +496,47 @@ </dd> </dl><a NAME="HgLogBrowserDialog.__generateIcon" ID="HgLogBrowserDialog.__generateIcon"></a> <h4>HgLogBrowserDialog.__generateIcon</h4> -<b>__generateIcon</b>(<i>column, color, bottomedges, topedges, dotColor, currentRev, closed</i>) +<b>__generateIcon</b>(<i>column, color, bottomedges, topedges, dotColor, currentRev, closed, isDraft</i>) <p> Private method to generate an icon containing the revision tree for the given data. </p><dl> -<dt><i>column</i></dt> +<dt><i>column</i> (int)</dt> <dd> -column index of the revision (integer) -</dd><dt><i>color</i></dt> +column index of the revision +</dd><dt><i>color</i> (int)</dt> <dd> -color of the node (integer) -</dd><dt><i>bottomedges</i></dt> +color of the node +</dd><dt><i>bottomedges</i> (list of tuples of (int, int, int))</dt> <dd> list of edges for the bottom of the node - (list of tuples of three integers) -</dd><dt><i>topedges</i></dt> +</dd><dt><i>topedges</i> (list of tuples of (int, int, int))</dt> <dd> list of edges for the top of the node - (list of tuples of three integers) -</dd><dt><i>dotColor</i></dt> +</dd><dt><i>dotColor</i> (QColor)</dt> <dd> -color to be used for the dot (QColor) -</dd><dt><i>currentRev</i></dt> +color to be used for the dot +</dd><dt><i>currentRev</i> (bool)</dt> <dd> flag indicating to draw the icon for the - current revision (boolean) -</dd><dt><i>closed</i></dt> + current revision +</dd><dt><i>closed</i> (bool)</dt> <dd> flag indicating to draw an icon for a closed - branch (boolean) + branch +</dd><dt><i>isDraft</i> (bool)</dt> +<dd> +flag indicating an entry of phase 'draft' </dd> </dl><dl> <dt>Returns:</dt> <dd> -icon for the node (QIcon) +icon for the node +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +QIcon </dd> </dl><a NAME="HgLogBrowserDialog.__generateLogItem" ID="HgLogBrowserDialog.__generateLogItem"></a> <h4>HgLogBrowserDialog.__generateLogItem</h4> @@ -593,7 +610,12 @@ <dd> color name (string) </dd> -</dl><a NAME="HgLogBrowserDialog.__getLogEntries" ID="HgLogBrowserDialog.__getLogEntries"></a> +</dl><a NAME="HgLogBrowserDialog.__getHeads" ID="HgLogBrowserDialog.__getHeads"></a> +<h4>HgLogBrowserDialog.__getHeads</h4> +<b>__getHeads</b>(<i></i>) +<p> + Private method to get the list of all heads. +</p><a NAME="HgLogBrowserDialog.__getLogEntries" ID="HgLogBrowserDialog.__getLogEntries"></a> <h4>HgLogBrowserDialog.__getLogEntries</h4> <b>__getLogEntries</b>(<i>startRev=None, noEntries=0</i>) <p> @@ -1035,10 +1057,16 @@ </dd> </dl><a NAME="HgLogBrowserDialog.on_refreshButton_clicked" ID="HgLogBrowserDialog.on_refreshButton_clicked"></a> <h4>HgLogBrowserDialog.on_refreshButton_clicked</h4> -<b>on_refreshButton_clicked</b>(<i></i>) +<b>on_refreshButton_clicked</b>(<i>addNext=False</i>) <p> Private slot to refresh the log. -</p><a NAME="HgLogBrowserDialog.on_rxEdit_returnPressed" ID="HgLogBrowserDialog.on_rxEdit_returnPressed"></a> +</p><dl> +<dt><i>addNext</i> (bool)</dt> +<dd> +flag indicating to get a second batch of log entries as + well +</dd> +</dl><a NAME="HgLogBrowserDialog.on_rxEdit_returnPressed" ID="HgLogBrowserDialog.on_rxEdit_returnPressed"></a> <h4>HgLogBrowserDialog.on_rxEdit_returnPressed</h4> <b>on_rxEdit_returnPressed</b>(<i></i>) <p>