Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
- branch
- eric7
- changeset 10479
- 856476537696
- parent 9209
- b99e7fd55fd3
equal
deleted
inserted
replaced
| 10478:de9106c55c3d | 10479:856476537696 |
|---|---|
| 5 <link rel="stylesheet" href="styles.css"> | 5 <link rel="stylesheet" href="styles.css"> |
| 6 </head> | 6 </head> |
| 7 <body> | 7 <body> |
| 8 <a NAME="top" ID="top"></a> | 8 <a NAME="top" ID="top"></a> |
| 9 <h1>eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog</h1> | 9 <h1>eric7.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog</h1> |
| 10 | |
| 11 <p> | 10 <p> |
| 12 Module implementing a dialog to enter the data for a merge operation. | 11 Module implementing a dialog to enter the data for a merge operation. |
| 13 </p> | 12 </p> |
| 13 | |
| 14 <h3>Global Attributes</h3> | 14 <h3>Global Attributes</h3> |
| 15 | |
| 16 <table> | 15 <table> |
| 17 <tr><td>None</td></tr> | 16 <tr><td>None</td></tr> |
| 18 </table> | 17 </table> |
| 18 | |
| 19 <h3>Classes</h3> | 19 <h3>Classes</h3> |
| 20 | |
| 21 <table> | 20 <table> |
| 22 | |
| 23 <tr> | 21 <tr> |
| 24 <td><a href="#HgMergeDialog">HgMergeDialog</a></td> | 22 <td><a href="#HgMergeDialog">HgMergeDialog</a></td> |
| 25 <td>Class implementing a dialog to enter the data for a merge operation.</td> | 23 <td>Class implementing a dialog to enter the data for a merge operation.</td> |
| 26 </tr> | 24 </tr> |
| 27 </table> | 25 </table> |
| 26 | |
| 28 <h3>Functions</h3> | 27 <h3>Functions</h3> |
| 29 | |
| 30 <table> | 28 <table> |
| 31 <tr><td>None</td></tr> | 29 <tr><td>None</td></tr> |
| 32 </table> | 30 </table> |
| 31 | |
| 33 <hr /> | 32 <hr /> |
| 34 <hr /> | 33 <hr /> |
| 35 <a NAME="HgMergeDialog" ID="HgMergeDialog"></a> | 34 <a NAME="HgMergeDialog" ID="HgMergeDialog"></a> |
| 36 <h2>HgMergeDialog</h2> | 35 <h2>HgMergeDialog</h2> |
| 37 | |
| 38 <p> | 36 <p> |
| 39 Class implementing a dialog to enter the data for a merge operation. | 37 Class implementing a dialog to enter the data for a merge operation. |
| 40 </p> | 38 </p> |
| 39 | |
| 41 <h3>Derived from</h3> | 40 <h3>Derived from</h3> |
| 42 QDialog, Ui_HgMergeDialog | 41 QDialog, Ui_HgMergeDialog |
| 43 <h3>Class Attributes</h3> | 42 <h3>Class Attributes</h3> |
| 44 | |
| 45 <table> | 43 <table> |
| 46 <tr><td>None</td></tr> | 44 <tr><td>None</td></tr> |
| 47 </table> | 45 </table> |
| 46 | |
| 48 <h3>Class Methods</h3> | 47 <h3>Class Methods</h3> |
| 49 | |
| 50 <table> | 48 <table> |
| 51 <tr><td>None</td></tr> | 49 <tr><td>None</td></tr> |
| 52 </table> | 50 </table> |
| 51 | |
| 53 <h3>Methods</h3> | 52 <h3>Methods</h3> |
| 54 | |
| 55 <table> | 53 <table> |
| 56 | |
| 57 <tr> | 54 <tr> |
| 58 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td> | 55 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td> |
| 59 <td>Constructor</td> | 56 <td>Constructor</td> |
| 60 </tr> | 57 </tr> |
| 61 <tr> | 58 <tr> |
| 65 <tr> | 62 <tr> |
| 66 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> | 63 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> |
| 67 <td>Public method to retrieve the merge data.</td> | 64 <td>Public method to retrieve the merge data.</td> |
| 68 </tr> | 65 </tr> |
| 69 </table> | 66 </table> |
| 67 | |
| 70 <h3>Static Methods</h3> | 68 <h3>Static Methods</h3> |
| 71 | |
| 72 <table> | 69 <table> |
| 73 <tr><td>None</td></tr> | 70 <tr><td>None</td></tr> |
| 74 </table> | 71 </table> |
| 75 | 72 |
| 73 | |
| 76 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> | 74 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> |
| 77 <h4>HgMergeDialog (Constructor)</h4> | 75 <h4>HgMergeDialog (Constructor)</h4> |
| 78 <b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) | 76 <b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) |
| 79 | |
| 80 <p> | 77 <p> |
| 81 Constructor | 78 Constructor |
| 82 </p> | 79 </p> |
| 80 | |
| 83 <dl> | 81 <dl> |
| 84 | 82 |
| 85 <dt><i>tagsList</i> (list of str)</dt> | 83 <dt><i>tagsList</i> (list of str)</dt> |
| 86 <dd> | 84 <dd> |
| 87 list of tags | 85 list of tags |
| 100 </dd> | 98 </dd> |
| 101 </dl> | 99 </dl> |
| 102 <a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a> | 100 <a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a> |
| 103 <h4>HgMergeDialog.__updateOK</h4> | 101 <h4>HgMergeDialog.__updateOK</h4> |
| 104 <b>__updateOK</b>(<i></i>) | 102 <b>__updateOK</b>(<i></i>) |
| 105 | |
| 106 <p> | 103 <p> |
| 107 Private slot to update the OK button. | 104 Private slot to update the OK button. |
| 108 </p> | 105 </p> |
| 106 | |
| 109 <a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a> | 107 <a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a> |
| 110 <h4>HgMergeDialog.getParameters</h4> | 108 <h4>HgMergeDialog.getParameters</h4> |
| 111 <b>getParameters</b>(<i></i>) | 109 <b>getParameters</b>(<i></i>) |
| 112 | |
| 113 <p> | 110 <p> |
| 114 Public method to retrieve the merge data. | 111 Public method to retrieve the merge data. |
| 115 </p> | 112 </p> |
| 113 | |
| 116 <dl> | 114 <dl> |
| 117 <dt>Return:</dt> | 115 <dt>Return:</dt> |
| 118 <dd> | 116 <dd> |
| 119 tuple naming the revision and a flag indicating a | 117 tuple naming the revision and a flag indicating a |
| 120 forced merge | 118 forced merge |
