Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog.html
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9236
- db53a9efe7ef
- child 10479
- 856476537696
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 121 <p> | 121 <p> |
| 122 Constructor | 122 Constructor |
| 123 </p> | 123 </p> |
| 124 <dl> | 124 <dl> |
| 125 | 125 |
| 126 <dt><i>vcs</i></dt> | 126 <dt><i>vcs</i> (Subversion)</dt> |
| 127 <dd> | 127 <dd> |
| 128 reference to the vcs object | 128 reference to the vcs object |
| 129 </dd> | 129 </dd> |
| 130 <dt><i>parent</i></dt> | 130 <dt><i>parent</i> (QWidget)</dt> |
| 131 <dd> | 131 <dd> |
| 132 parent widget (QWidget) | 132 parent widget |
| 133 </dd> | 133 </dd> |
| 134 </dl> | 134 </dl> |
| 135 <a NAME="SvnDiffDialog.__appendText" ID="SvnDiffDialog.__appendText"></a> | 135 <a NAME="SvnDiffDialog.__appendText" ID="SvnDiffDialog.__appendText"></a> |
| 136 <h4>SvnDiffDialog.__appendText</h4> | 136 <h4>SvnDiffDialog.__appendText</h4> |
| 137 <b>__appendText</b>(<i>line</i>) | 137 <b>__appendText</b>(<i>line</i>) |
| 139 <p> | 139 <p> |
| 140 Private method to append text to the end of the contents pane. | 140 Private method to append text to the end of the contents pane. |
| 141 </p> | 141 </p> |
| 142 <dl> | 142 <dl> |
| 143 | 143 |
| 144 <dt><i>line</i></dt> | 144 <dt><i>line</i> (str)</dt> |
| 145 <dd> | 145 <dd> |
| 146 line of text to insert (string) | 146 line of text to insert |
| 147 </dd> | 147 </dd> |
| 148 </dl> | 148 </dl> |
| 149 <a NAME="SvnDiffDialog.__extractFileName" ID="SvnDiffDialog.__extractFileName"></a> | 149 <a NAME="SvnDiffDialog.__extractFileName" ID="SvnDiffDialog.__extractFileName"></a> |
| 150 <h4>SvnDiffDialog.__extractFileName</h4> | 150 <h4>SvnDiffDialog.__extractFileName</h4> |
| 151 <b>__extractFileName</b>(<i>line</i>) | 151 <b>__extractFileName</b>(<i>line</i>) |
| 153 <p> | 153 <p> |
| 154 Private method to extract the file name out of a file separator line. | 154 Private method to extract the file name out of a file separator line. |
| 155 </p> | 155 </p> |
| 156 <dl> | 156 <dl> |
| 157 | 157 |
| 158 <dt><i>line</i></dt> | 158 <dt><i>line</i> (str)</dt> |
| 159 <dd> | 159 <dd> |
| 160 line to be processed (string) | 160 line to be processed |
| 161 </dd> | 161 </dd> |
| 162 </dl> | 162 </dl> |
| 163 <dl> | 163 <dl> |
| 164 <dt>Return:</dt> | 164 <dt>Return:</dt> |
| 165 <dd> | 165 <dd> |
| 166 extracted file name (string) | 166 extracted file name |
| 167 </dd> | |
| 168 </dl> | |
| 169 <dl> | |
| 170 <dt>Return Type:</dt> | |
| 171 <dd> | |
| 172 str | |
| 167 </dd> | 173 </dd> |
| 168 </dl> | 174 </dl> |
| 169 <a NAME="SvnDiffDialog.__finish" ID="SvnDiffDialog.__finish"></a> | 175 <a NAME="SvnDiffDialog.__finish" ID="SvnDiffDialog.__finish"></a> |
| 170 <h4>SvnDiffDialog.__finish</h4> | 176 <h4>SvnDiffDialog.__finish</h4> |
| 171 <b>__finish</b>(<i></i>) | 177 <b>__finish</b>(<i></i>) |
| 180 <p> | 186 <p> |
| 181 Private method to get a string descripion of the diff summary. | 187 Private method to get a string descripion of the diff summary. |
| 182 </p> | 188 </p> |
| 183 <dl> | 189 <dl> |
| 184 | 190 |
| 185 <dt><i>summaryKind</i></dt> | 191 <dt><i>summaryKind</i> (pysvn.diff_summarize.summarize_kind)</dt> |
| 186 <dd> | 192 <dd> |
| 187 (pysvn.diff_summarize.summarize_kind) | 193 |
| 188 </dd> | 194 </dd> |
| 189 </dl> | 195 </dl> |
| 190 <dl> | 196 <dl> |
| 191 <dt>Return:</dt> | 197 <dt>Return:</dt> |
| 192 <dd> | 198 <dd> |
| 193 one letter string indicating the change type (string) | 199 one letter string indicating the change type |
| 200 </dd> | |
| 201 </dl> | |
| 202 <dl> | |
| 203 <dt>Return Type:</dt> | |
| 204 <dd> | |
| 205 str | |
| 194 </dd> | 206 </dd> |
| 195 </dl> | 207 </dl> |
| 196 <a NAME="SvnDiffDialog.__getVersionArg" ID="SvnDiffDialog.__getVersionArg"></a> | 208 <a NAME="SvnDiffDialog.__getVersionArg" ID="SvnDiffDialog.__getVersionArg"></a> |
| 197 <h4>SvnDiffDialog.__getVersionArg</h4> | 209 <h4>SvnDiffDialog.__getVersionArg</h4> |
| 198 <b>__getVersionArg</b>(<i>version</i>) | 210 <b>__getVersionArg</b>(<i>version</i>) |
| 201 Private method to get a pysvn revision object for the given version | 213 Private method to get a pysvn revision object for the given version |
| 202 number. | 214 number. |
| 203 </p> | 215 </p> |
| 204 <dl> | 216 <dl> |
| 205 | 217 |
| 206 <dt><i>version</i></dt> | 218 <dt><i>version</i> (int or str)</dt> |
| 207 <dd> | 219 <dd> |
| 208 revision (integer or string) | 220 revision |
| 209 </dd> | 221 </dd> |
| 210 </dl> | 222 </dl> |
| 211 <dl> | 223 <dl> |
| 212 <dt>Return:</dt> | 224 <dt>Return:</dt> |
| 213 <dd> | 225 <dd> |
| 214 revision object (pysvn.Revision) | 226 revision object |
| 227 </dd> | |
| 228 </dl> | |
| 229 <dl> | |
| 230 <dt>Return Type:</dt> | |
| 231 <dd> | |
| 232 pysvn.Revision | |
| 215 </dd> | 233 </dd> |
| 216 </dl> | 234 </dl> |
| 217 <a NAME="SvnDiffDialog.__processFileLine" ID="SvnDiffDialog.__processFileLine"></a> | 235 <a NAME="SvnDiffDialog.__processFileLine" ID="SvnDiffDialog.__processFileLine"></a> |
| 218 <h4>SvnDiffDialog.__processFileLine</h4> | 236 <h4>SvnDiffDialog.__processFileLine</h4> |
| 219 <b>__processFileLine</b>(<i>line</i>) | 237 <b>__processFileLine</b>(<i>line</i>) |
| 221 <p> | 239 <p> |
| 222 Private slot to process a line giving the old/new file. | 240 Private slot to process a line giving the old/new file. |
| 223 </p> | 241 </p> |
| 224 <dl> | 242 <dl> |
| 225 | 243 |
| 226 <dt><i>line</i></dt> | 244 <dt><i>line</i> (str)</dt> |
| 227 <dd> | 245 <dd> |
| 228 line to be processed (string) | 246 line to be processed |
| 229 </dd> | 247 </dd> |
| 230 </dl> | 248 </dl> |
| 231 <a NAME="SvnDiffDialog.__showError" ID="SvnDiffDialog.__showError"></a> | 249 <a NAME="SvnDiffDialog.__showError" ID="SvnDiffDialog.__showError"></a> |
| 232 <h4>SvnDiffDialog.__showError</h4> | 250 <h4>SvnDiffDialog.__showError</h4> |
| 233 <b>__showError</b>(<i>msg</i>) | 251 <b>__showError</b>(<i>msg</i>) |
| 235 <p> | 253 <p> |
| 236 Private slot to show an error message. | 254 Private slot to show an error message. |
| 237 </p> | 255 </p> |
| 238 <dl> | 256 <dl> |
| 239 | 257 |
| 240 <dt><i>msg</i></dt> | 258 <dt><i>msg</i> (str)</dt> |
| 241 <dd> | 259 <dd> |
| 242 error message to show (string) | 260 error message to show |
| 243 </dd> | 261 </dd> |
| 244 </dl> | 262 </dl> |
| 245 <a NAME="SvnDiffDialog.on_buttonBox_clicked" ID="SvnDiffDialog.on_buttonBox_clicked"></a> | 263 <a NAME="SvnDiffDialog.on_buttonBox_clicked" ID="SvnDiffDialog.on_buttonBox_clicked"></a> |
| 246 <h4>SvnDiffDialog.on_buttonBox_clicked</h4> | 264 <h4>SvnDiffDialog.on_buttonBox_clicked</h4> |
| 247 <b>on_buttonBox_clicked</b>(<i>button</i>) | 265 <b>on_buttonBox_clicked</b>(<i>button</i>) |
| 249 <p> | 267 <p> |
| 250 Private slot called by a button of the button box clicked. | 268 Private slot called by a button of the button box clicked. |
| 251 </p> | 269 </p> |
| 252 <dl> | 270 <dl> |
| 253 | 271 |
| 254 <dt><i>button</i></dt> | 272 <dt><i>button</i> (QAbstractButton)</dt> |
| 255 <dd> | 273 <dd> |
| 256 button that was clicked (QAbstractButton) | 274 button that was clicked |
| 257 </dd> | 275 </dd> |
| 258 </dl> | 276 </dl> |
| 259 <a NAME="SvnDiffDialog.on_filesCombo_activated" ID="SvnDiffDialog.on_filesCombo_activated"></a> | 277 <a NAME="SvnDiffDialog.on_filesCombo_activated" ID="SvnDiffDialog.on_filesCombo_activated"></a> |
| 260 <h4>SvnDiffDialog.on_filesCombo_activated</h4> | 278 <h4>SvnDiffDialog.on_filesCombo_activated</h4> |
| 261 <b>on_filesCombo_activated</b>(<i>index</i>) | 279 <b>on_filesCombo_activated</b>(<i>index</i>) |
| 263 <p> | 281 <p> |
| 264 Private slot to handle the selection of a file. | 282 Private slot to handle the selection of a file. |
| 265 </p> | 283 </p> |
| 266 <dl> | 284 <dl> |
| 267 | 285 |
| 268 <dt><i>index</i></dt> | 286 <dt><i>index</i> (int)</dt> |
| 269 <dd> | 287 <dd> |
| 270 activated row (integer) | 288 activated row |
| 271 </dd> | 289 </dd> |
| 272 </dl> | 290 </dl> |
| 273 <a NAME="SvnDiffDialog.on_refreshButton_clicked" ID="SvnDiffDialog.on_refreshButton_clicked"></a> | 291 <a NAME="SvnDiffDialog.on_refreshButton_clicked" ID="SvnDiffDialog.on_refreshButton_clicked"></a> |
| 274 <h4>SvnDiffDialog.on_refreshButton_clicked</h4> | 292 <h4>SvnDiffDialog.on_refreshButton_clicked</h4> |
| 275 <b>on_refreshButton_clicked</b>(<i></i>) | 293 <b>on_refreshButton_clicked</b>(<i></i>) |
| 295 <p> | 313 <p> |
| 296 Public slot to start the svn diff command. | 314 Public slot to start the svn diff command. |
| 297 </p> | 315 </p> |
| 298 <dl> | 316 <dl> |
| 299 | 317 |
| 300 <dt><i>fn</i></dt> | 318 <dt><i>fn</i> (str)</dt> |
| 301 <dd> | 319 <dd> |
| 302 filename to be diffed (string) | 320 filename to be diffed |
| 303 </dd> | 321 </dd> |
| 304 <dt><i>versions</i></dt> | 322 <dt><i>versions</i> (list of up to 2 int or None)</dt> |
| 305 <dd> | 323 <dd> |
| 306 list of versions to be diffed (list of up to 2 integer | 324 list of versions to be diffed |
| 307 or None) | 325 </dd> |
| 308 </dd> | 326 <dt><i>urls</i> (list of [str, str])</dt> |
| 309 <dt><i>urls</i></dt> | 327 <dd> |
| 310 <dd> | 328 list of repository URLs |
| 311 list of repository URLs (list of 2 strings) | 329 </dd> |
| 312 </dd> | 330 <dt><i>summary</i> (bool)</dt> |
| 313 <dt><i>summary</i></dt> | |
| 314 <dd> | 331 <dd> |
| 315 flag indicating a summarizing diff | 332 flag indicating a summarizing diff |
| 316 (only valid for URL diffs) (boolean) | 333 (only valid for URL diffs) |
| 317 </dd> | 334 </dd> |
| 318 <dt><i>pegRev</i></dt> | 335 <dt><i>pegRev</i> (int)</dt> |
| 319 <dd> | 336 <dd> |
| 320 revision number the filename is valid (integer) | 337 revision number the filename is valid |
| 321 </dd> | 338 </dd> |
| 322 <dt><i>refreshable</i></dt> | 339 <dt><i>refreshable</i> (bool)</dt> |
| 323 <dd> | 340 <dd> |
| 324 flag indicating a refreshable diff (boolean) | 341 flag indicating a refreshable diff |
| 325 </dd> | 342 </dd> |
| 326 </dl> | 343 </dl> |
| 327 <div align="right"><a href="#top">Up</a></div> | 344 <div align="right"><a href="#top">Up</a></div> |
| 328 <hr /> | 345 <hr /> |
| 329 </body></html> | 346 </body></html> |
