Mercurial Repositories > eric / file comparison
comparison: src/eric7/VCS/VersionControl.py
src/eric7/VCS/VersionControl.py
- branch
- eric7
- changeset 10683
- 779cda568acb
- parent 10491
- acabc60b19a2
- child 11013
- ad483a12058c
equal
deleted
inserted
replaced
| 10682:47be220abdaf | 10683:779cda568acb |
|---|---|
| 810 """ | 810 """ |
| 811 for key in self.interestingDataKeys: | 811 for key in self.interestingDataKeys: |
| 812 if key in dictionary: | 812 if key in dictionary: |
| 813 self.otherData[key] = dictionary[key] | 813 self.otherData[key] = dictionary[key] |
| 814 | 814 |
| 815 def vcsResolved(self, name): # noqa: U100 | 815 def vcsResolved(self, _name): |
| 816 """ | 816 """ |
| 817 Public method used to resolve conflicts of a file/directory. | 817 Public method used to resolve conflicts of a file/directory. |
| 818 | 818 |
| 819 @param name file/directory name to be resolved | 819 @param _name file/directory name to be resolved (unused) |
| 820 @type str | 820 @type str |
| 821 """ | 821 """ |
| 822 # default implementation just refreshes the status | 822 # default implementation just refreshes the status |
| 823 self.checkVCSStatus() | 823 self.checkVCSStatus() |
| 824 | 824 |
| 1121 thread. | 1121 thread. |
| 1122 | 1122 |
| 1123 Note: This method should be overwritten in subclasses in order to | 1123 Note: This method should be overwritten in subclasses in order to |
| 1124 support VCS status monitoring. | 1124 support VCS status monitoring. |
| 1125 | 1125 |
| 1126 @param interval check interval for the monitor thread in seconds | 1126 @param interval check interval for the monitor thread in seconds (unused) |
| 1127 @type int | 1127 @type int |
| 1128 @param project reference to the project object | 1128 @param project reference to the project object (unused) |
| 1129 @type Project | 1129 @type Project |
| 1130 @return reference to the monitor thread | 1130 @return reference to the monitor thread |
| 1131 @rtype QThread | 1131 @rtype QThread |
| 1132 """ | 1132 """ |
| 1133 return None # __IGNORE_WARNING_M831__ | 1133 return None # __IGNORE_WARNING_M831__ |
