Mercurial Repositories > eric / file comparison

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

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

changeset 7273
391d6b7b1eff
parent 6942
2602857055c5
child 7900
72b88fb20261
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.SvnDiffDialog</h1> 23 <h1>eric6.Plugins.VcsPlugins.vcsPySvn.SvnDiffDialog</h1>
24
23 <p> 25 <p>
24 Module implementing a dialog to show the output of the svn diff command 26 Module implementing a dialog to show the output of the svn diff command
25 process. 27 process.
26 </p> 28 </p>
27 <h3>Global Attributes</h3> 29 <h3>Global Attributes</h3>
30
28 <table> 31 <table>
29 <tr><td>None</td></tr> 32 <tr><td>None</td></tr>
30 </table> 33 </table>
31 <h3>Classes</h3> 34 <h3>Classes</h3>
32 <table> 35
36 <table>
37
33 <tr> 38 <tr>
34 <td><a href="#SvnDiffDialog">SvnDiffDialog</a></td> 39 <td><a href="#SvnDiffDialog">SvnDiffDialog</a></td>
35 <td>Class implementing a dialog to show the output of the svn diff command.</td> 40 <td>Class implementing a dialog to show the output of the svn diff command.</td>
36 </tr> 41 </tr>
37 </table> 42 </table>
38 <h3>Functions</h3> 43 <h3>Functions</h3>
39 <table> 44
40 <tr><td>None</td></tr> 45 <table>
41 </table> 46 <tr><td>None</td></tr>
42 <hr /><hr /> 47 </table>
48 <hr />
49 <hr />
43 <a NAME="SvnDiffDialog" ID="SvnDiffDialog"></a> 50 <a NAME="SvnDiffDialog" ID="SvnDiffDialog"></a>
44 <h2>SvnDiffDialog</h2> 51 <h2>SvnDiffDialog</h2>
52
45 <p> 53 <p>
46 Class implementing a dialog to show the output of the svn diff command. 54 Class implementing a dialog to show the output of the svn diff command.
47 </p> 55 </p>
48 <h3>Derived from</h3> 56 <h3>Derived from</h3>
49 QWidget, SvnDialogMixin, Ui_SvnDiffDialog 57 QWidget, SvnDialogMixin, Ui_SvnDiffDialog
50 <h3>Class Attributes</h3> 58 <h3>Class Attributes</h3>
59
51 <table> 60 <table>
52 <tr><td>None</td></tr> 61 <tr><td>None</td></tr>
53 </table> 62 </table>
54 <h3>Class Methods</h3> 63 <h3>Class Methods</h3>
64
55 <table> 65 <table>
56 <tr><td>None</td></tr> 66 <tr><td>None</td></tr>
57 </table> 67 </table>
58 <h3>Methods</h3> 68 <h3>Methods</h3>
59 <table> 69
70 <table>
71
60 <tr> 72 <tr>
61 <td><a href="#SvnDiffDialog.__init__">SvnDiffDialog</a></td> 73 <td><a href="#SvnDiffDialog.__init__">SvnDiffDialog</a></td>
62 <td>Constructor</td> 74 <td>Constructor</td>
63 </tr><tr> 75 </tr>
76 <tr>
64 <td><a href="#SvnDiffDialog.__appendText">__appendText</a></td> 77 <td><a href="#SvnDiffDialog.__appendText">__appendText</a></td>
65 <td>Private method to append text to the end of the contents pane.</td> 78 <td>Private method to append text to the end of the contents pane.</td>
66 </tr><tr> 79 </tr>
80 <tr>
67 <td><a href="#SvnDiffDialog.__extractFileName">__extractFileName</a></td> 81 <td><a href="#SvnDiffDialog.__extractFileName">__extractFileName</a></td>
68 <td>Private method to extract the file name out of a file separator line.</td> 82 <td>Private method to extract the file name out of a file separator line.</td>
69 </tr><tr> 83 </tr>
84 <tr>
70 <td><a href="#SvnDiffDialog.__finish">__finish</a></td> 85 <td><a href="#SvnDiffDialog.__finish">__finish</a></td>
71 <td>Private slot called when the user pressed the button.</td> 86 <td>Private slot called when the user pressed the button.</td>
72 </tr><tr> 87 </tr>
88 <tr>
73 <td><a href="#SvnDiffDialog.__getDiffSummaryKind">__getDiffSummaryKind</a></td> 89 <td><a href="#SvnDiffDialog.__getDiffSummaryKind">__getDiffSummaryKind</a></td>
74 <td>Private method to get a string descripion of the diff summary.</td> 90 <td>Private method to get a string descripion of the diff summary.</td>
75 </tr><tr> 91 </tr>
92 <tr>
76 <td><a href="#SvnDiffDialog.__getVersionArg">__getVersionArg</a></td> 93 <td><a href="#SvnDiffDialog.__getVersionArg">__getVersionArg</a></td>
77 <td>Private method to get a pysvn revision object for the given version number.</td> 94 <td>Private method to get a pysvn revision object for the given version number.</td>
78 </tr><tr> 95 </tr>
96 <tr>
79 <td><a href="#SvnDiffDialog.__processFileLine">__processFileLine</a></td> 97 <td><a href="#SvnDiffDialog.__processFileLine">__processFileLine</a></td>
80 <td>Private slot to process a line giving the old/new file.</td> 98 <td>Private slot to process a line giving the old/new file.</td>
81 </tr><tr> 99 </tr>
100 <tr>
82 <td><a href="#SvnDiffDialog.__showError">__showError</a></td> 101 <td><a href="#SvnDiffDialog.__showError">__showError</a></td>
83 <td>Private slot to show an error message.</td> 102 <td>Private slot to show an error message.</td>
84 </tr><tr> 103 </tr>
104 <tr>
85 <td><a href="#SvnDiffDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td> 105 <td><a href="#SvnDiffDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td>
86 <td>Private slot called by a button of the button box clicked.</td> 106 <td>Private slot called by a button of the button box clicked.</td>
87 </tr><tr> 107 </tr>
108 <tr>
88 <td><a href="#SvnDiffDialog.on_filesCombo_activated">on_filesCombo_activated</a></td> 109 <td><a href="#SvnDiffDialog.on_filesCombo_activated">on_filesCombo_activated</a></td>
89 <td>Private slot to handle the selection of a file.</td> 110 <td>Private slot to handle the selection of a file.</td>
90 </tr><tr> 111 </tr>
112 <tr>
91 <td><a href="#SvnDiffDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td> 113 <td><a href="#SvnDiffDialog.on_refreshButton_clicked">on_refreshButton_clicked</a></td>
92 <td>Private slot to refresh the display.</td> 114 <td>Private slot to refresh the display.</td>
93 </tr><tr> 115 </tr>
116 <tr>
94 <td><a href="#SvnDiffDialog.on_saveButton_clicked">on_saveButton_clicked</a></td> 117 <td><a href="#SvnDiffDialog.on_saveButton_clicked">on_saveButton_clicked</a></td>
95 <td>Private slot to handle the Save button press.</td> 118 <td>Private slot to handle the Save button press.</td>
96 </tr><tr> 119 </tr>
120 <tr>
97 <td><a href="#SvnDiffDialog.start">start</a></td> 121 <td><a href="#SvnDiffDialog.start">start</a></td>
98 <td>Public slot to start the svn diff command.</td> 122 <td>Public slot to start the svn diff command.</td>
99 </tr> 123 </tr>
100 </table> 124 </table>
101 <h3>Static Methods</h3> 125 <h3>Static Methods</h3>
102 <table> 126
103 <tr><td>None</td></tr> 127 <table>
104 </table> 128 <tr><td>None</td></tr>
129 </table>
130
105 <a NAME="SvnDiffDialog.__init__" ID="SvnDiffDialog.__init__"></a> 131 <a NAME="SvnDiffDialog.__init__" ID="SvnDiffDialog.__init__"></a>
106 <h4>SvnDiffDialog (Constructor)</h4> 132 <h4>SvnDiffDialog (Constructor)</h4>
107 <b>SvnDiffDialog</b>(<i>vcs, parent=None</i>) 133 <b>SvnDiffDialog</b>(<i>vcs, parent=None</i>)
134
108 <p> 135 <p>
109 Constructor 136 Constructor
110 </p><dl> 137 </p>
138 <dl>
139
111 <dt><i>vcs</i></dt> 140 <dt><i>vcs</i></dt>
112 <dd> 141 <dd>
113 reference to the vcs object 142 reference to the vcs object
114 </dd><dt><i>parent</i></dt> 143 </dd>
144 <dt><i>parent</i></dt>
115 <dd> 145 <dd>
116 parent widget (QWidget) 146 parent widget (QWidget)
117 </dd> 147 </dd>
118 </dl><a NAME="SvnDiffDialog.__appendText" ID="SvnDiffDialog.__appendText"></a> 148 </dl>
149 <a NAME="SvnDiffDialog.__appendText" ID="SvnDiffDialog.__appendText"></a>
119 <h4>SvnDiffDialog.__appendText</h4> 150 <h4>SvnDiffDialog.__appendText</h4>
120 <b>__appendText</b>(<i>line</i>) 151 <b>__appendText</b>(<i>line</i>)
152
121 <p> 153 <p>
122 Private method to append text to the end of the contents pane. 154 Private method to append text to the end of the contents pane.
123 </p><dl> 155 </p>
156 <dl>
157
124 <dt><i>line</i></dt> 158 <dt><i>line</i></dt>
125 <dd> 159 <dd>
126 line of text to insert (string) 160 line of text to insert (string)
127 </dd> 161 </dd>
128 </dl><a NAME="SvnDiffDialog.__extractFileName" ID="SvnDiffDialog.__extractFileName"></a> 162 </dl>
163 <a NAME="SvnDiffDialog.__extractFileName" ID="SvnDiffDialog.__extractFileName"></a>
129 <h4>SvnDiffDialog.__extractFileName</h4> 164 <h4>SvnDiffDialog.__extractFileName</h4>
130 <b>__extractFileName</b>(<i>line</i>) 165 <b>__extractFileName</b>(<i>line</i>)
166
131 <p> 167 <p>
132 Private method to extract the file name out of a file separator line. 168 Private method to extract the file name out of a file separator line.
133 </p><dl> 169 </p>
170 <dl>
171
134 <dt><i>line</i></dt> 172 <dt><i>line</i></dt>
135 <dd> 173 <dd>
136 line to be processed (string) 174 line to be processed (string)
137 </dd> 175 </dd>
138 </dl><dl> 176 </dl>
177 <dl>
139 <dt>Returns:</dt> 178 <dt>Returns:</dt>
140 <dd> 179 <dd>
141 extracted file name (string) 180 extracted file name (string)
142 </dd> 181 </dd>
143 </dl><a NAME="SvnDiffDialog.__finish" ID="SvnDiffDialog.__finish"></a> 182 </dl>
183 <a NAME="SvnDiffDialog.__finish" ID="SvnDiffDialog.__finish"></a>
144 <h4>SvnDiffDialog.__finish</h4> 184 <h4>SvnDiffDialog.__finish</h4>
145 <b>__finish</b>(<i></i>) 185 <b>__finish</b>(<i></i>)
186
146 <p> 187 <p>
147 Private slot called when the user pressed the button. 188 Private slot called when the user pressed the button.
148 </p><a NAME="SvnDiffDialog.__getDiffSummaryKind" ID="SvnDiffDialog.__getDiffSummaryKind"></a> 189 </p>
190 <a NAME="SvnDiffDialog.__getDiffSummaryKind" ID="SvnDiffDialog.__getDiffSummaryKind"></a>
149 <h4>SvnDiffDialog.__getDiffSummaryKind</h4> 191 <h4>SvnDiffDialog.__getDiffSummaryKind</h4>
150 <b>__getDiffSummaryKind</b>(<i>summaryKind</i>) 192 <b>__getDiffSummaryKind</b>(<i>summaryKind</i>)
193
151 <p> 194 <p>
152 Private method to get a string descripion of the diff summary. 195 Private method to get a string descripion of the diff summary.
153 </p><dl> 196 </p>
197 <dl>
198
154 <dt><i>summaryKind</i></dt> 199 <dt><i>summaryKind</i></dt>
155 <dd> 200 <dd>
156 (pysvn.diff_summarize.summarize_kind) 201 (pysvn.diff_summarize.summarize_kind)
157 </dd> 202 </dd>
158 </dl><dl> 203 </dl>
204 <dl>
159 <dt>Returns:</dt> 205 <dt>Returns:</dt>
160 <dd> 206 <dd>
161 one letter string indicating the change type (string) 207 one letter string indicating the change type (string)
162 </dd> 208 </dd>
163 </dl><a NAME="SvnDiffDialog.__getVersionArg" ID="SvnDiffDialog.__getVersionArg"></a> 209 </dl>
210 <a NAME="SvnDiffDialog.__getVersionArg" ID="SvnDiffDialog.__getVersionArg"></a>
164 <h4>SvnDiffDialog.__getVersionArg</h4> 211 <h4>SvnDiffDialog.__getVersionArg</h4>
165 <b>__getVersionArg</b>(<i>version</i>) 212 <b>__getVersionArg</b>(<i>version</i>)
213
166 <p> 214 <p>
167 Private method to get a pysvn revision object for the given version 215 Private method to get a pysvn revision object for the given version
168 number. 216 number.
169 </p><dl> 217 </p>
218 <dl>
219
170 <dt><i>version</i></dt> 220 <dt><i>version</i></dt>
171 <dd> 221 <dd>
172 revision (integer or string) 222 revision (integer or string)
173 </dd> 223 </dd>
174 </dl><dl> 224 </dl>
225 <dl>
175 <dt>Returns:</dt> 226 <dt>Returns:</dt>
176 <dd> 227 <dd>
177 revision object (pysvn.Revision) 228 revision object (pysvn.Revision)
178 </dd> 229 </dd>
179 </dl><a NAME="SvnDiffDialog.__processFileLine" ID="SvnDiffDialog.__processFileLine"></a> 230 </dl>
231 <a NAME="SvnDiffDialog.__processFileLine" ID="SvnDiffDialog.__processFileLine"></a>
180 <h4>SvnDiffDialog.__processFileLine</h4> 232 <h4>SvnDiffDialog.__processFileLine</h4>
181 <b>__processFileLine</b>(<i>line</i>) 233 <b>__processFileLine</b>(<i>line</i>)
234
182 <p> 235 <p>
183 Private slot to process a line giving the old/new file. 236 Private slot to process a line giving the old/new file.
184 </p><dl> 237 </p>
238 <dl>
239
185 <dt><i>line</i></dt> 240 <dt><i>line</i></dt>
186 <dd> 241 <dd>
187 line to be processed (string) 242 line to be processed (string)
188 </dd> 243 </dd>
189 </dl><a NAME="SvnDiffDialog.__showError" ID="SvnDiffDialog.__showError"></a> 244 </dl>
245 <a NAME="SvnDiffDialog.__showError" ID="SvnDiffDialog.__showError"></a>
190 <h4>SvnDiffDialog.__showError</h4> 246 <h4>SvnDiffDialog.__showError</h4>
191 <b>__showError</b>(<i>msg</i>) 247 <b>__showError</b>(<i>msg</i>)
248
192 <p> 249 <p>
193 Private slot to show an error message. 250 Private slot to show an error message.
194 </p><dl> 251 </p>
252 <dl>
253
195 <dt><i>msg</i></dt> 254 <dt><i>msg</i></dt>
196 <dd> 255 <dd>
197 error message to show (string) 256 error message to show (string)
198 </dd> 257 </dd>
199 </dl><a NAME="SvnDiffDialog.on_buttonBox_clicked" ID="SvnDiffDialog.on_buttonBox_clicked"></a> 258 </dl>
259 <a NAME="SvnDiffDialog.on_buttonBox_clicked" ID="SvnDiffDialog.on_buttonBox_clicked"></a>
200 <h4>SvnDiffDialog.on_buttonBox_clicked</h4> 260 <h4>SvnDiffDialog.on_buttonBox_clicked</h4>
201 <b>on_buttonBox_clicked</b>(<i>button</i>) 261 <b>on_buttonBox_clicked</b>(<i>button</i>)
262
202 <p> 263 <p>
203 Private slot called by a button of the button box clicked. 264 Private slot called by a button of the button box clicked.
204 </p><dl> 265 </p>
266 <dl>
267
205 <dt><i>button</i></dt> 268 <dt><i>button</i></dt>
206 <dd> 269 <dd>
207 button that was clicked (QAbstractButton) 270 button that was clicked (QAbstractButton)
208 </dd> 271 </dd>
209 </dl><a NAME="SvnDiffDialog.on_filesCombo_activated" ID="SvnDiffDialog.on_filesCombo_activated"></a> 272 </dl>
273 <a NAME="SvnDiffDialog.on_filesCombo_activated" ID="SvnDiffDialog.on_filesCombo_activated"></a>
210 <h4>SvnDiffDialog.on_filesCombo_activated</h4> 274 <h4>SvnDiffDialog.on_filesCombo_activated</h4>
211 <b>on_filesCombo_activated</b>(<i>index</i>) 275 <b>on_filesCombo_activated</b>(<i>index</i>)
276
212 <p> 277 <p>
213 Private slot to handle the selection of a file. 278 Private slot to handle the selection of a file.
214 </p><dl> 279 </p>
280 <dl>
281
215 <dt><i>index</i></dt> 282 <dt><i>index</i></dt>
216 <dd> 283 <dd>
217 activated row (integer) 284 activated row (integer)
218 </dd> 285 </dd>
219 </dl><a NAME="SvnDiffDialog.on_refreshButton_clicked" ID="SvnDiffDialog.on_refreshButton_clicked"></a> 286 </dl>
287 <a NAME="SvnDiffDialog.on_refreshButton_clicked" ID="SvnDiffDialog.on_refreshButton_clicked"></a>
220 <h4>SvnDiffDialog.on_refreshButton_clicked</h4> 288 <h4>SvnDiffDialog.on_refreshButton_clicked</h4>
221 <b>on_refreshButton_clicked</b>(<i></i>) 289 <b>on_refreshButton_clicked</b>(<i></i>)
290
222 <p> 291 <p>
223 Private slot to refresh the display. 292 Private slot to refresh the display.
224 </p><a NAME="SvnDiffDialog.on_saveButton_clicked" ID="SvnDiffDialog.on_saveButton_clicked"></a> 293 </p>
294 <a NAME="SvnDiffDialog.on_saveButton_clicked" ID="SvnDiffDialog.on_saveButton_clicked"></a>
225 <h4>SvnDiffDialog.on_saveButton_clicked</h4> 295 <h4>SvnDiffDialog.on_saveButton_clicked</h4>
226 <b>on_saveButton_clicked</b>(<i></i>) 296 <b>on_saveButton_clicked</b>(<i></i>)
297
227 <p> 298 <p>
228 Private slot to handle the Save button press. 299 Private slot to handle the Save button press.
229 </p><p> 300 </p>
301 <p>
230 It saves the diff shown in the dialog to a file in the local 302 It saves the diff shown in the dialog to a file in the local
231 filesystem. 303 filesystem.
232 </p><a NAME="SvnDiffDialog.start" ID="SvnDiffDialog.start"></a> 304 </p>
305 <a NAME="SvnDiffDialog.start" ID="SvnDiffDialog.start"></a>
233 <h4>SvnDiffDialog.start</h4> 306 <h4>SvnDiffDialog.start</h4>
234 <b>start</b>(<i>fn, versions=None, urls=None, summary=False, pegRev=None, refreshable=False</i>) 307 <b>start</b>(<i>fn, versions=None, urls=None, summary=False, pegRev=None, refreshable=False</i>)
308
235 <p> 309 <p>
236 Public slot to start the svn diff command. 310 Public slot to start the svn diff command.
237 </p><dl> 311 </p>
312 <dl>
313
238 <dt><i>fn</i></dt> 314 <dt><i>fn</i></dt>
239 <dd> 315 <dd>
240 filename to be diffed (string) 316 filename to be diffed (string)
241 </dd><dt><i>versions</i></dt> 317 </dd>
318 <dt><i>versions</i></dt>
242 <dd> 319 <dd>
243 list of versions to be diffed (list of up to 2 integer 320 list of versions to be diffed (list of up to 2 integer
244 or None) 321 or None)
245 </dd><dt><i>urls=</i></dt> 322 </dd>
323 <dt><i>urls=</i></dt>
246 <dd> 324 <dd>
247 list of repository URLs (list of 2 strings) 325 list of repository URLs (list of 2 strings)
248 </dd><dt><i>summary=</i></dt> 326 </dd>
327 <dt><i>summary=</i></dt>
249 <dd> 328 <dd>
250 flag indicating a summarizing diff 329 flag indicating a summarizing diff
251 (only valid for URL diffs) (boolean) 330 (only valid for URL diffs) (boolean)
252 </dd><dt><i>pegRev=</i></dt> 331 </dd>
332 <dt><i>pegRev=</i></dt>
253 <dd> 333 <dd>
254 revision number the filename is valid (integer) 334 revision number the filename is valid (integer)
255 </dd><dt><i>refreshable=</i></dt> 335 </dd>
336 <dt><i>refreshable=</i></dt>
256 <dd> 337 <dd>
257 flag indicating a refreshable diff (boolean) 338 flag indicating a refreshable diff (boolean)
258 </dd> 339 </dd>
259 </dl> 340 </dl>
260 <div align="right"><a href="#top">Up</a></div> 341 <div align="right"><a href="#top">Up</a></div>

Mercurial Repository: eric

eric ide

mercurial