Mercurial Repositories > eric / file comparison
comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html
eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffGenerator.html
- branch
- maintenance
- changeset 8043
- 0acf98cd089a
- parent 7989
- a21d673a8f99
equal
deleted
inserted
replaced
| 7991:866adc8c315b | 8043:0acf98cd089a |
|---|---|
| 146 <dd> | 146 <dd> |
| 147 line to be processed (string) | 147 line to be processed (string) |
| 148 </dd> | 148 </dd> |
| 149 </dl> | 149 </dl> |
| 150 <dl> | 150 <dl> |
| 151 <dt>Returns:</dt> | 151 <dt>Return:</dt> |
| 152 <dd> | 152 <dd> |
| 153 extracted file name (string) | 153 extracted file name (string) |
| 154 </dd> | 154 </dd> |
| 155 </dl> | 155 </dl> |
| 156 <a NAME="HgDiffGenerator.__finish" ID="HgDiffGenerator.__finish"></a> | 156 <a NAME="HgDiffGenerator.__finish" ID="HgDiffGenerator.__finish"></a> |
| 174 <dd> | 174 <dd> |
| 175 revision (integer or string) | 175 revision (integer or string) |
| 176 </dd> | 176 </dd> |
| 177 </dl> | 177 </dl> |
| 178 <dl> | 178 <dl> |
| 179 <dt>Returns:</dt> | 179 <dt>Return:</dt> |
| 180 <dd> | 180 <dd> |
| 181 version argument (string) | 181 version argument (string) |
| 182 </dd> | 182 </dd> |
| 183 </dl> | 183 </dl> |
| 184 <a NAME="HgDiffGenerator.__processFileLine" ID="HgDiffGenerator.__processFileLine"></a> | 184 <a NAME="HgDiffGenerator.__processFileLine" ID="HgDiffGenerator.__processFileLine"></a> |
| 205 | 205 |
| 206 <p> | 206 <p> |
| 207 Public method to return the result data. | 207 Public method to return the result data. |
| 208 </p> | 208 </p> |
| 209 <dl> | 209 <dl> |
| 210 <dt>Returns:</dt> | 210 <dt>Return:</dt> |
| 211 <dd> | 211 <dd> |
| 212 tuple of lists of string containing lines of the diff, the | 212 tuple of lists of string containing lines of the diff, the |
| 213 list of errors and a list of tuples of filenames and the line | 213 list of errors and a list of tuples of filenames and the line |
| 214 into the diff output. | 214 into the diff output. |
| 215 </dd> | 215 </dd> |
| 225 | 225 |
| 226 <dt><i>fn</i></dt> | 226 <dt><i>fn</i></dt> |
| 227 <dd> | 227 <dd> |
| 228 filename to be diffed (string) | 228 filename to be diffed (string) |
| 229 </dd> | 229 </dd> |
| 230 <dt><i>versions=</i></dt> | 230 <dt><i>versions</i></dt> |
| 231 <dd> | 231 <dd> |
| 232 list of versions to be diffed (list of up to | 232 list of versions to be diffed (list of up to |
| 233 2 strings or None) | 233 2 strings or None) |
| 234 </dd> | 234 </dd> |
| 235 <dt><i>bundle=</i></dt> | 235 <dt><i>bundle</i></dt> |
| 236 <dd> | 236 <dd> |
| 237 name of a bundle file (string) | 237 name of a bundle file (string) |
| 238 </dd> | 238 </dd> |
| 239 <dt><i>qdiff=</i></dt> | 239 <dt><i>qdiff</i></dt> |
| 240 <dd> | 240 <dd> |
| 241 flag indicating qdiff command shall be used (boolean) | 241 flag indicating qdiff command shall be used (boolean) |
| 242 </dd> | 242 </dd> |
| 243 </dl> | 243 </dl> |
| 244 <dl> | 244 <dl> |
| 245 <dt>Returns:</dt> | 245 <dt>Return:</dt> |
| 246 <dd> | 246 <dd> |
| 247 flag indicating a successful start of the diff command | 247 flag indicating a successful start of the diff command |
| 248 (boolean) | 248 (boolean) |
| 249 </dd> | 249 </dd> |
| 250 </dl> | 250 </dl> |
