Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html
src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html
- branch
- eric7
- changeset 10438
- 4cd7e5a8b3cf
- parent 9209
- b99e7fd55fd3
- child 10479
- 856476537696
equal
deleted
inserted
replaced
| 10437:2f70ca07f0af | 10438:4cd7e5a8b3cf |
|---|---|
| 108 <p> | 108 <p> |
| 109 Constructor | 109 Constructor |
| 110 </p> | 110 </p> |
| 111 <dl> | 111 <dl> |
| 112 | 112 |
| 113 <dt><i>vcs</i></dt> | 113 <dt><i>vcs</i> (Hg)</dt> |
| 114 <dd> | 114 <dd> |
| 115 reference to the vcs object | 115 reference to the vcs object |
| 116 </dd> | 116 </dd> |
| 117 <dt><i>parent</i></dt> | 117 <dt><i>parent</i> (QWidget)</dt> |
| 118 <dd> | 118 <dd> |
| 119 parent widget (QWidget) | 119 parent widget |
| 120 </dd> | 120 </dd> |
| 121 </dl> | 121 </dl> |
| 122 <a NAME="HgDiffGenerator.__extractFileName" ID="HgDiffGenerator.__extractFileName"></a> | 122 <a NAME="HgDiffGenerator.__extractFileName" ID="HgDiffGenerator.__extractFileName"></a> |
| 123 <h4>HgDiffGenerator.__extractFileName</h4> | 123 <h4>HgDiffGenerator.__extractFileName</h4> |
| 124 <b>__extractFileName</b>(<i>line</i>) | 124 <b>__extractFileName</b>(<i>line</i>) |
| 126 <p> | 126 <p> |
| 127 Private method to extract the file name out of a file separator line. | 127 Private method to extract the file name out of a file separator line. |
| 128 </p> | 128 </p> |
| 129 <dl> | 129 <dl> |
| 130 | 130 |
| 131 <dt><i>line</i></dt> | 131 <dt><i>line</i> (str)</dt> |
| 132 <dd> | 132 <dd> |
| 133 line to be processed (string) | 133 line to be processed |
| 134 </dd> | 134 </dd> |
| 135 </dl> | 135 </dl> |
| 136 <dl> | 136 <dl> |
| 137 <dt>Return:</dt> | 137 <dt>Return:</dt> |
| 138 <dd> | 138 <dd> |
| 139 extracted file name (string) | 139 extracted file name |
| 140 </dd> | |
| 141 </dl> | |
| 142 <dl> | |
| 143 <dt>Return Type:</dt> | |
| 144 <dd> | |
| 145 str | |
| 140 </dd> | 146 </dd> |
| 141 </dl> | 147 </dl> |
| 142 <a NAME="HgDiffGenerator.__finish" ID="HgDiffGenerator.__finish"></a> | 148 <a NAME="HgDiffGenerator.__finish" ID="HgDiffGenerator.__finish"></a> |
| 143 <h4>HgDiffGenerator.__finish</h4> | 149 <h4>HgDiffGenerator.__finish</h4> |
| 144 <b>__finish</b>(<i></i>) | 150 <b>__finish</b>(<i></i>) |
| 154 <p> | 160 <p> |
| 155 Private method to get a hg revision argument for the given revision. | 161 Private method to get a hg revision argument for the given revision. |
| 156 </p> | 162 </p> |
| 157 <dl> | 163 <dl> |
| 158 | 164 |
| 159 <dt><i>version</i></dt> | 165 <dt><i>version</i> (int or str)</dt> |
| 160 <dd> | 166 <dd> |
| 161 revision (integer or string) | 167 revision |
| 162 </dd> | 168 </dd> |
| 163 </dl> | 169 </dl> |
| 164 <dl> | 170 <dl> |
| 165 <dt>Return:</dt> | 171 <dt>Return:</dt> |
| 166 <dd> | 172 <dd> |
| 167 version argument (string) | 173 version argument |
| 174 </dd> | |
| 175 </dl> | |
| 176 <dl> | |
| 177 <dt>Return Type:</dt> | |
| 178 <dd> | |
| 179 str | |
| 168 </dd> | 180 </dd> |
| 169 </dl> | 181 </dl> |
| 170 <a NAME="HgDiffGenerator.__processFileLine" ID="HgDiffGenerator.__processFileLine"></a> | 182 <a NAME="HgDiffGenerator.__processFileLine" ID="HgDiffGenerator.__processFileLine"></a> |
| 171 <h4>HgDiffGenerator.__processFileLine</h4> | 183 <h4>HgDiffGenerator.__processFileLine</h4> |
| 172 <b>__processFileLine</b>(<i>lineno, line</i>) | 184 <b>__processFileLine</b>(<i>lineno, line</i>) |
| 193 Public method to return the result data. | 205 Public method to return the result data. |
| 194 </p> | 206 </p> |
| 195 <dl> | 207 <dl> |
| 196 <dt>Return:</dt> | 208 <dt>Return:</dt> |
| 197 <dd> | 209 <dd> |
| 198 tuple of lists of string containing lines of the diff, the | 210 tuple containing a list of lines of the diff, a list of errors |
| 199 list of errors and a list of tuples of filenames and the line | 211 and a list of tuples of filenames and the line into the diff output |
| 200 into the diff output. | 212 </dd> |
| 213 </dl> | |
| 214 <dl> | |
| 215 <dt>Return Type:</dt> | |
| 216 <dd> | |
| 217 tuple of (list of str, list of str, list of tuple of (str, int)) | |
| 201 </dd> | 218 </dd> |
| 202 </dl> | 219 </dl> |
| 203 <a NAME="HgDiffGenerator.start" ID="HgDiffGenerator.start"></a> | 220 <a NAME="HgDiffGenerator.start" ID="HgDiffGenerator.start"></a> |
| 204 <h4>HgDiffGenerator.start</h4> | 221 <h4>HgDiffGenerator.start</h4> |
| 205 <b>start</b>(<i>fn, versions=None, bundle=None, qdiff=False</i>) | 222 <b>start</b>(<i>fn, versions=None, bundle=None, qdiff=False</i>) |
| 207 <p> | 224 <p> |
| 208 Public slot to start the hg diff command. | 225 Public slot to start the hg diff command. |
| 209 </p> | 226 </p> |
| 210 <dl> | 227 <dl> |
| 211 | 228 |
| 212 <dt><i>fn</i></dt> | 229 <dt><i>fn</i> (str)</dt> |
| 213 <dd> | 230 <dd> |
| 214 filename to be diffed (string) | 231 filename to be diffed |
| 215 </dd> | 232 </dd> |
| 216 <dt><i>versions</i></dt> | 233 <dt><i>versions</i> (list of up to 2 str or None)</dt> |
| 217 <dd> | 234 <dd> |
| 218 list of versions to be diffed (list of up to | 235 list of versions to be diffed |
| 219 2 strings or None) | 236 </dd> |
| 220 </dd> | 237 <dt><i>bundle</i> (str)</dt> |
| 221 <dt><i>bundle</i></dt> | 238 <dd> |
| 222 <dd> | 239 name of a bundle file |
| 223 name of a bundle file (string) | 240 </dd> |
| 224 </dd> | 241 <dt><i>qdiff</i> (bool)</dt> |
| 225 <dt><i>qdiff</i></dt> | 242 <dd> |
| 226 <dd> | 243 flag indicating qdiff command shall be used |
| 227 flag indicating qdiff command shall be used (boolean) | |
| 228 </dd> | 244 </dd> |
| 229 </dl> | 245 </dl> |
| 230 <dl> | 246 <dl> |
| 231 <dt>Return:</dt> | 247 <dt>Return:</dt> |
| 232 <dd> | 248 <dd> |
| 233 flag indicating a successful start of the diff command | 249 flag indicating a successful start of the diff command |
| 234 (boolean) | 250 </dd> |
| 251 </dl> | |
| 252 <dl> | |
| 253 <dt>Return Type:</dt> | |
| 254 <dd> | |
| 255 bool | |
| 235 </dd> | 256 </dd> |
| 236 </dl> | 257 </dl> |
| 237 <a NAME="HgDiffGenerator.stopProcess" ID="HgDiffGenerator.stopProcess"></a> | 258 <a NAME="HgDiffGenerator.stopProcess" ID="HgDiffGenerator.stopProcess"></a> |
| 238 <h4>HgDiffGenerator.stopProcess</h4> | 259 <h4>HgDiffGenerator.stopProcess</h4> |
| 239 <b>stopProcess</b>(<i></i>) | 260 <b>stopProcess</b>(<i></i>) |
