Mercurial Repositories > eric / file comparison
comparison: eric7/VCS/VersionControl.py
eric7/VCS/VersionControl.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8620
- 84f7f7867b5f
- child 8624
- 5192a2592324
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 300 @param name file/directory name to be diffed (string) | 300 @param name file/directory name to be diffed (string) |
| 301 @exception RuntimeError to indicate that this method must be | 301 @exception RuntimeError to indicate that this method must be |
| 302 implemented by a subclass | 302 implemented by a subclass |
| 303 """ | 303 """ |
| 304 raise RuntimeError('Not implemented') | 304 raise RuntimeError('Not implemented') |
| 305 | 305 |
| 306 def vcsSbsDiff(self, name, extended=False, revisions=None): | |
| 307 """ | |
| 308 Public method used to view the difference of a file to the Mercurial | |
| 309 repository side-by-side. | |
| 310 | |
| 311 @param name file name to be diffed | |
| 312 @type str | |
| 313 @param extended flag indicating the extended variant | |
| 314 @type bool | |
| 315 @param revisions tuple of two revisions | |
| 316 @type tuple of two str | |
| 317 @exception RuntimeError to indicate that this method must be | |
| 318 implemented by a subclass | |
| 319 """ | |
| 320 raise RuntimeError('Not implemented') | |
| 321 | |
| 306 def vcsStatus(self, name): | 322 def vcsStatus(self, name): |
| 307 """ | 323 """ |
| 308 Public method used to view the status of a file/directory in the vcs. | 324 Public method used to view the status of a file/directory in the vcs. |
| 309 | 325 |
| 310 @param name file/directory name to show the status for (string) | 326 @param name file/directory name to show the status for (string) |
| 325 | 341 |
| 326 def vcsRevert(self, name): | 342 def vcsRevert(self, name): |
| 327 """ | 343 """ |
| 328 Public method used to revert changes made to a file/directory. | 344 Public method used to revert changes made to a file/directory. |
| 329 | 345 |
| 330 @param name file/directory name to be reverted (string) | 346 @param name file/directory name to be reverted |
| 331 @exception RuntimeError to indicate that this method must be | 347 @type str |
| 332 implemented by a subclass | 348 @return flag indicating, that the update contained an add |
| 333 """ | 349 or delete |
| 334 raise RuntimeError('Not implemented') | 350 @rtype bool |
| 335 | 351 @exception RuntimeError to indicate that this method must be |
| 352 implemented by a subclass | |
| 353 """ | |
| 354 raise RuntimeError('Not implemented') | |
| 355 | |
| 356 return False | |
| 357 | |
| 358 def vcsForget(self, name): | |
| 359 """ | |
| 360 Public method used to remove a file from the repository. | |
| 361 | |
| 362 @param name file/directory name to be removed | |
| 363 @type str or list of str | |
| 364 @exception RuntimeError to indicate that this method must be | |
| 365 implemented by a subclass | |
| 366 """ | |
| 367 raise RuntimeError('Not implemented') | |
| 368 | |
| 336 def vcsSwitch(self, name): | 369 def vcsSwitch(self, name): |
| 337 """ | 370 """ |
| 338 Public method used to switch a directory to a different tag/branch. | 371 Public method used to switch a directory to a different tag/branch. |
| 339 | 372 |
| 340 @param name directory name to be switched (string) | 373 @param name directory name to be switched (string) |
| 577 @param dictionary dictionary to pick entries from | 610 @param dictionary dictionary to pick entries from |
| 578 """ | 611 """ |
| 579 for key in self.interestingDataKeys: | 612 for key in self.interestingDataKeys: |
| 580 if key in dictionary: | 613 if key in dictionary: |
| 581 self.otherData[key] = dictionary[key] | 614 self.otherData[key] = dictionary[key] |
| 582 | 615 |
| 616 def vcsResolved(self, name): | |
| 617 """ | |
| 618 Public method used to resolve conflicts of a file/directory. | |
| 619 | |
| 620 @param name file/directory name to be resolved | |
| 621 @type str | |
| 622 """ | |
| 623 # default implementation just refreshes the status | |
| 624 self.checkVCSStatus() | |
| 625 | |
| 583 ##################################################################### | 626 ##################################################################### |
| 584 ## below are some utility methods | 627 ## below are some utility methods |
| 585 ##################################################################### | 628 ##################################################################### |
| 586 | 629 |
| 587 def startSynchronizedProcess(self, proc, program, arguments, | 630 def startSynchronizedProcess(self, proc, program, arguments, |
