Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
- changeset 178
- dd9f0bca5e2f
- child 409
- 0ea528e80202
equal
deleted
inserted
replaced
| 177:c822ccc4d138 | 178:dd9f0bca5e2f |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | |
| 2 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' | |
| 3 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> | |
| 4 <html><head> | |
| 5 <title>eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog</title> | |
| 6 <style> | |
| 7 body { | |
| 8 background:white; | |
| 9 margin: 0em 1em 10em 1em; | |
| 10 color: black; | |
| 11 } | |
| 12 | |
| 13 h1 { color: white; background: #4FA4FF; } | |
| 14 h2 { color: white; background: #4FA4FF; } | |
| 15 h3 { color: white; background: #00557F; } | |
| 16 h4 { color: white; background: #00557F; } | |
| 17 | |
| 18 a { color: #AA5500; } | |
| 19 | |
| 20 </style> | |
| 21 </head> | |
| 22 <body><a NAME="top" ID="top"></a> | |
| 23 <h1>eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog</h1> | |
| 24 <p> | |
| 25 Module implementing a dialog to enter the data for a merge operation. | |
| 26 </p> | |
| 27 <h3>Global Attributes</h3> | |
| 28 <table> | |
| 29 <tr><td>None</td></tr> | |
| 30 </table> | |
| 31 <h3>Classes</h3> | |
| 32 <table> | |
| 33 <tr> | |
| 34 <td><a href="#HgMergeDialog">HgMergeDialog</a></td> | |
| 35 <td>Class implementing a dialog to enter the data for a merge operation.</td> | |
| 36 </tr> | |
| 37 </table> | |
| 38 <h3>Functions</h3> | |
| 39 <table> | |
| 40 <tr><td>None</td></tr> | |
| 41 </table> | |
| 42 <hr /><hr /> | |
| 43 <a NAME="HgMergeDialog" ID="HgMergeDialog"></a> | |
| 44 <h2>HgMergeDialog</h2> | |
| 45 <p> | |
| 46 Class implementing a dialog to enter the data for a merge operation. | |
| 47 </p> | |
| 48 <h3>Derived from</h3> | |
| 49 QDialog, Ui_HgMergeDialog | |
| 50 <h3>Class Attributes</h3> | |
| 51 <table> | |
| 52 <tr><td>None</td></tr> | |
| 53 </table> | |
| 54 <h3>Methods</h3> | |
| 55 <table> | |
| 56 <tr> | |
| 57 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td> | |
| 58 <td>Constructor</td> | |
| 59 </tr><tr> | |
| 60 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> | |
| 61 <td>Public method to retrieve the merge data.</td> | |
| 62 </tr> | |
| 63 </table> | |
| 64 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> | |
| 65 <h4>HgMergeDialog (Constructor)</h4> | |
| 66 <b>HgMergeDialog</b>(<i>force, tagsList, branchesList, parent = None</i>) | |
| 67 <p> | |
| 68 Constructor | |
| 69 </p><dl> | |
| 70 <dt><i>force</i></dt> | |
| 71 <dd> | |
| 72 flag indicating a forced merge (boolean) | |
| 73 </dd><dt><i>tagsList</i></dt> | |
| 74 <dd> | |
| 75 list of tags (list of strings) | |
| 76 </dd><dt><i>branchesList</i></dt> | |
| 77 <dd> | |
| 78 list of branches (list of strings) | |
| 79 </dd><dt><i>parent</i></dt> | |
| 80 <dd> | |
| 81 parent widget (QWidget) | |
| 82 </dd> | |
| 83 </dl><a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a> | |
| 84 <h4>HgMergeDialog.getParameters</h4> | |
| 85 <b>getParameters</b>(<i></i>) | |
| 86 <p> | |
| 87 Public method to retrieve the merge data. | |
| 88 </p><dl> | |
| 89 <dt>Returns:</dt> | |
| 90 <dd> | |
| 91 tuple naming the revision and a flag indicating a | |
| 92 forced merge (string, boolean) | |
| 93 </dd> | |
| 94 </dl> | |
| 95 <div align="right"><a href="#top">Up</a></div> | |
| 96 <hr /> | |
| 97 </body></html> |
