Mercurial Repositories > eric / file comparison

comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html

eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.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.vcsMercurial.HgMergeDialog</h1> 23 <h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog</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>
31 <table> 34
35 <table>
36
32 <tr> 37 <tr>
33 <td><a href="#HgMergeDialog">HgMergeDialog</a></td> 38 <td><a href="#HgMergeDialog">HgMergeDialog</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>
38 <table> 43
39 <tr><td>None</td></tr> 44 <table>
40 </table> 45 <tr><td>None</td></tr>
41 <hr /><hr /> 46 </table>
47 <hr />
48 <hr />
42 <a NAME="HgMergeDialog" ID="HgMergeDialog"></a> 49 <a NAME="HgMergeDialog" ID="HgMergeDialog"></a>
43 <h2>HgMergeDialog</h2> 50 <h2>HgMergeDialog</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_HgMergeDialog 56 QDialog, Ui_HgMergeDialog
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>
58 <table> 68
69 <table>
70
59 <tr> 71 <tr>
60 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td> 72 <td><a href="#HgMergeDialog.__init__">HgMergeDialog</a></td>
61 <td>Constructor</td> 73 <td>Constructor</td>
62 </tr><tr> 74 </tr>
75 <tr>
63 <td><a href="#HgMergeDialog.__updateOK">__updateOK</a></td> 76 <td><a href="#HgMergeDialog.__updateOK">__updateOK</a></td>
64 <td>Private slot to update the OK button.</td> 77 <td>Private slot to update the OK button.</td>
65 </tr><tr> 78 </tr>
79 <tr>
66 <td><a href="#HgMergeDialog.getParameters">getParameters</a></td> 80 <td><a href="#HgMergeDialog.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="#HgMergeDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td> 84 <td><a href="#HgMergeDialog.on_bookmarkButton_toggled">on_bookmarkButton_toggled</a></td>
70 <td>Private slot to handle changes of the Bookmark select button.</td> 85 <td>Private slot to handle changes of the Bookmark select button.</td>
71 </tr><tr> 86 </tr>
87 <tr>
72 <td><a href="#HgMergeDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td> 88 <td><a href="#HgMergeDialog.on_bookmarkCombo_editTextChanged">on_bookmarkCombo_editTextChanged</a></td>
73 <td>Private slot to handle changes of the Bookmark combo.</td> 89 <td>Private slot to handle changes of the Bookmark combo.</td>
74 </tr><tr> 90 </tr>
91 <tr>
75 <td><a href="#HgMergeDialog.on_branchButton_toggled">on_branchButton_toggled</a></td> 92 <td><a href="#HgMergeDialog.on_branchButton_toggled">on_branchButton_toggled</a></td>
76 <td>Private slot to handle changes of the Branch select button.</td> 93 <td>Private slot to handle changes of the Branch select button.</td>
77 </tr><tr> 94 </tr>
95 <tr>
78 <td><a href="#HgMergeDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td> 96 <td><a href="#HgMergeDialog.on_branchCombo_editTextChanged">on_branchCombo_editTextChanged</a></td>
79 <td>Private slot to handle changes of the Branch combo.</td> 97 <td>Private slot to handle changes of the Branch combo.</td>
80 </tr><tr> 98 </tr>
99 <tr>
81 <td><a href="#HgMergeDialog.on_idButton_toggled">on_idButton_toggled</a></td> 100 <td><a href="#HgMergeDialog.on_idButton_toggled">on_idButton_toggled</a></td>
82 <td>Private slot to handle changes of the ID select button.</td> 101 <td>Private slot to handle changes of the ID select button.</td>
83 </tr><tr> 102 </tr>
103 <tr>
84 <td><a href="#HgMergeDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td> 104 <td><a href="#HgMergeDialog.on_idEdit_textChanged">on_idEdit_textChanged</a></td>
85 <td>Private slot to handle changes of the ID edit.</td> 105 <td>Private slot to handle changes of the ID edit.</td>
86 </tr><tr> 106 </tr>
107 <tr>
87 <td><a href="#HgMergeDialog.on_tagButton_toggled">on_tagButton_toggled</a></td> 108 <td><a href="#HgMergeDialog.on_tagButton_toggled">on_tagButton_toggled</a></td>
88 <td>Private slot to handle changes of the Tag select button.</td> 109 <td>Private slot to handle changes of the Tag select button.</td>
89 </tr><tr> 110 </tr>
111 <tr>
90 <td><a href="#HgMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td> 112 <td><a href="#HgMergeDialog.on_tagCombo_editTextChanged">on_tagCombo_editTextChanged</a></td>
91 <td>Private slot to handle changes of the Tag combo.</td> 113 <td>Private slot to handle changes of the Tag combo.</td>
92 </tr> 114 </tr>
93 </table> 115 </table>
94 <h3>Static Methods</h3> 116 <h3>Static Methods</h3>
95 <table> 117
96 <tr><td>None</td></tr> 118 <table>
97 </table> 119 <tr><td>None</td></tr>
120 </table>
121
98 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> 122 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a>
99 <h4>HgMergeDialog (Constructor)</h4> 123 <h4>HgMergeDialog (Constructor)</h4>
100 <b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) 124 <b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>)
125
101 <p> 126 <p>
102 Constructor 127 Constructor
103 </p><dl> 128 </p>
129 <dl>
130
104 <dt><i>tagsList</i></dt> 131 <dt><i>tagsList</i></dt>
105 <dd> 132 <dd>
106 list of tags (list of strings) 133 list of tags (list of strings)
107 </dd><dt><i>branchesList</i></dt> 134 </dd>
135 <dt><i>branchesList</i></dt>
108 <dd> 136 <dd>
109 list of branches (list of strings) 137 list of branches (list of strings)
110 </dd><dt><i>bookmarksList</i></dt> 138 </dd>
139 <dt><i>bookmarksList</i></dt>
111 <dd> 140 <dd>
112 list of bookmarks (list of strings) 141 list of bookmarks (list of strings)
113 </dd><dt><i>parent</i></dt> 142 </dd>
143 <dt><i>parent</i></dt>
114 <dd> 144 <dd>
115 parent widget (QWidget) 145 parent widget (QWidget)
116 </dd> 146 </dd>
117 </dl><a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a> 147 </dl>
148 <a NAME="HgMergeDialog.__updateOK" ID="HgMergeDialog.__updateOK"></a>
118 <h4>HgMergeDialog.__updateOK</h4> 149 <h4>HgMergeDialog.__updateOK</h4>
119 <b>__updateOK</b>(<i></i>) 150 <b>__updateOK</b>(<i></i>)
151
120 <p> 152 <p>
121 Private slot to update the OK button. 153 Private slot to update the OK button.
122 </p><a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a> 154 </p>
155 <a NAME="HgMergeDialog.getParameters" ID="HgMergeDialog.getParameters"></a>
123 <h4>HgMergeDialog.getParameters</h4> 156 <h4>HgMergeDialog.getParameters</h4>
124 <b>getParameters</b>(<i></i>) 157 <b>getParameters</b>(<i></i>)
158
125 <p> 159 <p>
126 Public method to retrieve the merge data. 160 Public method to retrieve the merge data.
127 </p><dl> 161 </p>
162 <dl>
128 <dt>Returns:</dt> 163 <dt>Returns:</dt>
129 <dd> 164 <dd>
130 tuple naming the revision and a flag indicating a 165 tuple naming the revision and a flag indicating a
131 forced merge (string, boolean) 166 forced merge (string, boolean)
132 </dd> 167 </dd>
133 </dl><a NAME="HgMergeDialog.on_bookmarkButton_toggled" ID="HgMergeDialog.on_bookmarkButton_toggled"></a> 168 </dl>
169 <a NAME="HgMergeDialog.on_bookmarkButton_toggled" ID="HgMergeDialog.on_bookmarkButton_toggled"></a>
134 <h4>HgMergeDialog.on_bookmarkButton_toggled</h4> 170 <h4>HgMergeDialog.on_bookmarkButton_toggled</h4>
135 <b>on_bookmarkButton_toggled</b>(<i>checked</i>) 171 <b>on_bookmarkButton_toggled</b>(<i>checked</i>)
172
136 <p> 173 <p>
137 Private slot to handle changes of the Bookmark select button. 174 Private slot to handle changes of the Bookmark select button.
138 </p><dl> 175 </p>
139 <dt><i>checked</i></dt> 176 <dl>
140 <dd> 177
141 state of the button (boolean) 178 <dt><i>checked</i></dt>
142 </dd> 179 <dd>
143 </dl><a NAME="HgMergeDialog.on_bookmarkCombo_editTextChanged" ID="HgMergeDialog.on_bookmarkCombo_editTextChanged"></a> 180 state of the button (boolean)
181 </dd>
182 </dl>
183 <a NAME="HgMergeDialog.on_bookmarkCombo_editTextChanged" ID="HgMergeDialog.on_bookmarkCombo_editTextChanged"></a>
144 <h4>HgMergeDialog.on_bookmarkCombo_editTextChanged</h4> 184 <h4>HgMergeDialog.on_bookmarkCombo_editTextChanged</h4>
145 <b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>) 185 <b>on_bookmarkCombo_editTextChanged</b>(<i>txt</i>)
186
146 <p> 187 <p>
147 Private slot to handle changes of the Bookmark combo. 188 Private slot to handle changes of the Bookmark combo.
148 </p><dl> 189 </p>
190 <dl>
191
149 <dt><i>txt</i></dt> 192 <dt><i>txt</i></dt>
150 <dd> 193 <dd>
151 text of the combo (string) 194 text of the combo (string)
152 </dd> 195 </dd>
153 </dl><a NAME="HgMergeDialog.on_branchButton_toggled" ID="HgMergeDialog.on_branchButton_toggled"></a> 196 </dl>
197 <a NAME="HgMergeDialog.on_branchButton_toggled" ID="HgMergeDialog.on_branchButton_toggled"></a>
154 <h4>HgMergeDialog.on_branchButton_toggled</h4> 198 <h4>HgMergeDialog.on_branchButton_toggled</h4>
155 <b>on_branchButton_toggled</b>(<i>checked</i>) 199 <b>on_branchButton_toggled</b>(<i>checked</i>)
200
156 <p> 201 <p>
157 Private slot to handle changes of the Branch select button. 202 Private slot to handle changes of the Branch select button.
158 </p><dl> 203 </p>
159 <dt><i>checked</i></dt> 204 <dl>
160 <dd> 205
161 state of the button (boolean) 206 <dt><i>checked</i></dt>
162 </dd> 207 <dd>
163 </dl><a NAME="HgMergeDialog.on_branchCombo_editTextChanged" ID="HgMergeDialog.on_branchCombo_editTextChanged"></a> 208 state of the button (boolean)
209 </dd>
210 </dl>
211 <a NAME="HgMergeDialog.on_branchCombo_editTextChanged" ID="HgMergeDialog.on_branchCombo_editTextChanged"></a>
164 <h4>HgMergeDialog.on_branchCombo_editTextChanged</h4> 212 <h4>HgMergeDialog.on_branchCombo_editTextChanged</h4>
165 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>) 213 <b>on_branchCombo_editTextChanged</b>(<i>txt</i>)
214
166 <p> 215 <p>
167 Private slot to handle changes of the Branch combo. 216 Private slot to handle changes of the Branch combo.
168 </p><dl> 217 </p>
218 <dl>
219
169 <dt><i>txt</i></dt> 220 <dt><i>txt</i></dt>
170 <dd> 221 <dd>
171 text of the combo (string) 222 text of the combo (string)
172 </dd> 223 </dd>
173 </dl><a NAME="HgMergeDialog.on_idButton_toggled" ID="HgMergeDialog.on_idButton_toggled"></a> 224 </dl>
225 <a NAME="HgMergeDialog.on_idButton_toggled" ID="HgMergeDialog.on_idButton_toggled"></a>
174 <h4>HgMergeDialog.on_idButton_toggled</h4> 226 <h4>HgMergeDialog.on_idButton_toggled</h4>
175 <b>on_idButton_toggled</b>(<i>checked</i>) 227 <b>on_idButton_toggled</b>(<i>checked</i>)
228
176 <p> 229 <p>
177 Private slot to handle changes of the ID select button. 230 Private slot to handle changes of the ID select button.
178 </p><dl> 231 </p>
179 <dt><i>checked</i></dt> 232 <dl>
180 <dd> 233
181 state of the button (boolean) 234 <dt><i>checked</i></dt>
182 </dd> 235 <dd>
183 </dl><a NAME="HgMergeDialog.on_idEdit_textChanged" ID="HgMergeDialog.on_idEdit_textChanged"></a> 236 state of the button (boolean)
237 </dd>
238 </dl>
239 <a NAME="HgMergeDialog.on_idEdit_textChanged" ID="HgMergeDialog.on_idEdit_textChanged"></a>
184 <h4>HgMergeDialog.on_idEdit_textChanged</h4> 240 <h4>HgMergeDialog.on_idEdit_textChanged</h4>
185 <b>on_idEdit_textChanged</b>(<i>txt</i>) 241 <b>on_idEdit_textChanged</b>(<i>txt</i>)
242
186 <p> 243 <p>
187 Private slot to handle changes of the ID edit. 244 Private slot to handle changes of the ID edit.
188 </p><dl> 245 </p>
246 <dl>
247
189 <dt><i>txt</i></dt> 248 <dt><i>txt</i></dt>
190 <dd> 249 <dd>
191 text of the edit (string) 250 text of the edit (string)
192 </dd> 251 </dd>
193 </dl><a NAME="HgMergeDialog.on_tagButton_toggled" ID="HgMergeDialog.on_tagButton_toggled"></a> 252 </dl>
253 <a NAME="HgMergeDialog.on_tagButton_toggled" ID="HgMergeDialog.on_tagButton_toggled"></a>
194 <h4>HgMergeDialog.on_tagButton_toggled</h4> 254 <h4>HgMergeDialog.on_tagButton_toggled</h4>
195 <b>on_tagButton_toggled</b>(<i>checked</i>) 255 <b>on_tagButton_toggled</b>(<i>checked</i>)
256
196 <p> 257 <p>
197 Private slot to handle changes of the Tag select button. 258 Private slot to handle changes of the Tag select button.
198 </p><dl> 259 </p>
199 <dt><i>checked</i></dt> 260 <dl>
200 <dd> 261
201 state of the button (boolean) 262 <dt><i>checked</i></dt>
202 </dd> 263 <dd>
203 </dl><a NAME="HgMergeDialog.on_tagCombo_editTextChanged" ID="HgMergeDialog.on_tagCombo_editTextChanged"></a> 264 state of the button (boolean)
265 </dd>
266 </dl>
267 <a NAME="HgMergeDialog.on_tagCombo_editTextChanged" ID="HgMergeDialog.on_tagCombo_editTextChanged"></a>
204 <h4>HgMergeDialog.on_tagCombo_editTextChanged</h4> 268 <h4>HgMergeDialog.on_tagCombo_editTextChanged</h4>
205 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>) 269 <b>on_tagCombo_editTextChanged</b>(<i>txt</i>)
270
206 <p> 271 <p>
207 Private slot to handle changes of the Tag combo. 272 Private slot to handle changes of the Tag combo.
208 </p><dl> 273 </p>
274 <dl>
275
209 <dt><i>txt</i></dt> 276 <dt><i>txt</i></dt>
210 <dd> 277 <dd>
211 text of the combo (string) 278 text of the combo (string)
212 </dd> 279 </dd>
213 </dl> 280 </dl>

Mercurial Repository: eric

eric ide

mercurial