Mercurial Repositories > eric / file comparison

comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html

eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html

changeset 7273
391d6b7b1eff
parent 6942
2602857055c5
child 7989
a21d673a8f99
equal deleted inserted replaced
7272:1779dc278077 7273:391d6b7b1eff
16 16
17 a { color: #BA6D36; } 17 a { color: #BA6D36; }
18 18
19 </style> 19 </style>
20 </head> 20 </head>
21 <body><a NAME="top" ID="top"></a> 21 <body>
22 <a NAME="top" ID="top"></a>
22 <h1>eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog</h1> 23 <h1>eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog</h1>
24
23 <p> 25 <p>
24 Module implementing a dialog to enter the data for a merge operation. 26 Module implementing a dialog to enter the data for a merge operation.
25 </p> 27 </p>
26 <h3>Global Attributes</h3> 28 <h3>Global Attributes</h3>
29
27 <table> 30 <table>
28 <tr><td>None</td></tr> 31 <tr><td>None</td></tr>
29 </table> 32 </table>
30 <h3>Classes</h3> 33 <h3>Classes</h3>
34
31 <table> 35 <table>
36
32 <tr> 37 <tr>
33 <td><a href="#SvnMergeDialog">SvnMergeDialog</a></td> 38 <td><a href="#SvnMergeDialog">SvnMergeDialog</a></td>
34 <td>Class implementing a dialog to enter the data for a merge operation.</td> 39 <td>Class implementing a dialog to enter the data for a merge operation.</td>
35 </tr> 40 </tr>
36 </table> 41 </table>
37 <h3>Functions</h3> 42 <h3>Functions</h3>
43
38 <table> 44 <table>
39 <tr><td>None</td></tr> 45 <tr><td>None</td></tr>
40 </table> 46 </table>
41 <hr /><hr /> 47 <hr />
48 <hr />
42 <a NAME="SvnMergeDialog" ID="SvnMergeDialog"></a> 49 <a NAME="SvnMergeDialog" ID="SvnMergeDialog"></a>
43 <h2>SvnMergeDialog</h2> 50 <h2>SvnMergeDialog</h2>
51
44 <p> 52 <p>
45 Class implementing a dialog to enter the data for a merge operation. 53 Class implementing a dialog to enter the data for a merge operation.
46 </p> 54 </p>
47 <h3>Derived from</h3> 55 <h3>Derived from</h3>
48 QDialog, Ui_SvnMergeDialog 56 QDialog, Ui_SvnMergeDialog
49 <h3>Class Attributes</h3> 57 <h3>Class Attributes</h3>
58
50 <table> 59 <table>
51 <tr><td>None</td></tr> 60 <tr><td>None</td></tr>
52 </table> 61 </table>
53 <h3>Class Methods</h3> 62 <h3>Class Methods</h3>
63
54 <table> 64 <table>
55 <tr><td>None</td></tr> 65 <tr><td>None</td></tr>
56 </table> 66 </table>
57 <h3>Methods</h3> 67 <h3>Methods</h3>
68
58 <table> 69 <table>
70
59 <tr> 71 <tr>
60 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> 72 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td>
61 <td>Constructor</td> 73 <td>Constructor</td>
62 </tr><tr> 74 </tr>
75 <tr>
63 <td><a href="#SvnMergeDialog.__enableOkButton">__enableOkButton</a></td> 76 <td><a href="#SvnMergeDialog.__enableOkButton">__enableOkButton</a></td>
64 <td>Private method used to enable/disable the OK-button.</td> 77 <td>Private method used to enable/disable the OK-button.</td>
65 </tr><tr> 78 </tr>
79 <tr>
66 <td><a href="#SvnMergeDialog.getParameters">getParameters</a></td> 80 <td><a href="#SvnMergeDialog.getParameters">getParameters</a></td>
67 <td>Public method to retrieve the merge data.</td> 81 <td>Public method to retrieve the merge data.</td>
68 </tr><tr> 82 </tr>
83 <tr>
69 <td><a href="#SvnMergeDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td> 84 <td><a href="#SvnMergeDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td>
70 <td>Private slot to handle the tag1Combo editTextChanged signal.</td> 85 <td>Private slot to handle the tag1Combo editTextChanged signal.</td>
71 </tr><tr> 86 </tr>
87 <tr>
72 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> 88 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td>
73 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> 89 <td>Private slot to handle the tag2Combo editTextChanged signal.</td>
74 </tr> 90 </tr>
75 </table> 91 </table>
76 <h3>Static Methods</h3> 92 <h3>Static Methods</h3>
93
77 <table> 94 <table>
78 <tr><td>None</td></tr> 95 <tr><td>None</td></tr>
79 </table> 96 </table>
97
80 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> 98 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a>
81 <h4>SvnMergeDialog (Constructor)</h4> 99 <h4>SvnMergeDialog (Constructor)</h4>
82 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>) 100 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>)
101
83 <p> 102 <p>
84 Constructor 103 Constructor
85 </p><dl> 104 </p>
105 <dl>
106
86 <dt><i>mergelist1</i></dt> 107 <dt><i>mergelist1</i></dt>
87 <dd> 108 <dd>
88 list of previously entered URLs/revisions 109 list of previously entered URLs/revisions
89 (list of strings) 110 (list of strings)
90 </dd><dt><i>mergelist2</i></dt> 111 </dd>
112 <dt><i>mergelist2</i></dt>
91 <dd> 113 <dd>
92 list of previously entered URLs/revisions 114 list of previously entered URLs/revisions
93 (list of strings) 115 (list of strings)
94 </dd><dt><i>targetlist</i></dt> 116 </dd>
117 <dt><i>targetlist</i></dt>
95 <dd> 118 <dd>
96 list of previously entered targets (list of strings) 119 list of previously entered targets (list of strings)
97 </dd><dt><i>force</i></dt> 120 </dd>
121 <dt><i>force</i></dt>
98 <dd> 122 <dd>
99 flag indicating a forced merge (boolean) 123 flag indicating a forced merge (boolean)
100 </dd><dt><i>parent</i></dt> 124 </dd>
125 <dt><i>parent</i></dt>
101 <dd> 126 <dd>
102 parent widget (QWidget) 127 parent widget (QWidget)
103 </dd> 128 </dd>
104 </dl><a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a> 129 </dl>
130 <a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a>
105 <h4>SvnMergeDialog.__enableOkButton</h4> 131 <h4>SvnMergeDialog.__enableOkButton</h4>
106 <b>__enableOkButton</b>(<i></i>) 132 <b>__enableOkButton</b>(<i></i>)
133
107 <p> 134 <p>
108 Private method used to enable/disable the OK-button. 135 Private method used to enable/disable the OK-button.
109 </p><a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a> 136 </p>
137 <a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a>
110 <h4>SvnMergeDialog.getParameters</h4> 138 <h4>SvnMergeDialog.getParameters</h4>
111 <b>getParameters</b>(<i></i>) 139 <b>getParameters</b>(<i></i>)
140
112 <p> 141 <p>
113 Public method to retrieve the merge data. 142 Public method to retrieve the merge data.
114 </p><dl> 143 </p>
144 <dl>
115 <dt>Returns:</dt> 145 <dt>Returns:</dt>
116 <dd> 146 <dd>
117 tuple naming two tag names or two revisions, a target and 147 tuple naming two tag names or two revisions, a target and
118 a flag indicating a forced merge (string, string, string, boolean) 148 a flag indicating a forced merge (string, string, string, boolean)
119 </dd> 149 </dd>
120 </dl><a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a> 150 </dl>
151 <a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a>
121 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4> 152 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4>
122 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>) 153 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>)
154
123 <p> 155 <p>
124 Private slot to handle the tag1Combo editTextChanged signal. 156 Private slot to handle the tag1Combo editTextChanged signal.
125 </p><dl> 157 </p>
158 <dl>
159
126 <dt><i>text</i></dt> 160 <dt><i>text</i></dt>
127 <dd> 161 <dd>
128 text of the combo (string) 162 text of the combo (string)
129 </dd> 163 </dd>
130 </dl><a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a> 164 </dl>
165 <a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a>
131 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4> 166 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4>
132 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>) 167 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>)
168
133 <p> 169 <p>
134 Private slot to handle the tag2Combo editTextChanged signal. 170 Private slot to handle the tag2Combo editTextChanged signal.
135 </p><dl> 171 </p>
172 <dl>
173
136 <dt><i>text</i></dt> 174 <dt><i>text</i></dt>
137 <dd> 175 <dd>
138 text of the combo (string) 176 text of the combo (string)
139 </dd> 177 </dd>
140 </dl> 178 </dl>

Mercurial Repository: eric

eric ide

mercurial