Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py
eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8358
- 144a6b854f70
- child 8624
- 5192a2592324
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 1120 | 1120 |
| 1121 def vcsRevert(self, name): | 1121 def vcsRevert(self, name): |
| 1122 """ | 1122 """ |
| 1123 Public method used to revert changes made to a file/directory. | 1123 Public method used to revert changes made to a file/directory. |
| 1124 | 1124 |
| 1125 @param name file/directory name to be reverted (string) | 1125 @param name file/directory name to be reverted |
| 1126 @type str | |
| 1127 @return flag indicating, that the update contained an add | |
| 1128 or delete | |
| 1129 @rtype bool | |
| 1126 """ | 1130 """ |
| 1127 recurse = False | 1131 recurse = False |
| 1128 if not isinstance(name, list): | 1132 if not isinstance(name, list): |
| 1129 name = [name] | 1133 name = [name] |
| 1130 if os.path.isdir(name[0]): | 1134 if os.path.isdir(name[0]): |
| 1165 except pysvn.ClientError as e: | 1169 except pysvn.ClientError as e: |
| 1166 dlg.showError(e.args[0]) | 1170 dlg.showError(e.args[0]) |
| 1167 dlg.finish() | 1171 dlg.finish() |
| 1168 dlg.exec() | 1172 dlg.exec() |
| 1169 self.checkVCSStatus() | 1173 self.checkVCSStatus() |
| 1174 | |
| 1175 return False | |
| 1176 | |
| 1177 def vcsForget(self, name): | |
| 1178 """ | |
| 1179 Public method used to remove a file from the repository. | |
| 1180 | |
| 1181 Note: svn does not support this operation. The method is implemented | |
| 1182 as a NoOp. | |
| 1183 | |
| 1184 @param name file/directory name to be removed | |
| 1185 @type str or list of str | |
| 1186 """ | |
| 1187 pass | |
| 1170 | 1188 |
| 1171 def vcsSwitch(self, name): | 1189 def vcsSwitch(self, name): |
| 1172 """ | 1190 """ |
| 1173 Public method used to switch a directory to a different tag/branch. | 1191 Public method used to switch a directory to a different tag/branch. |
| 1174 | 1192 |
| 1767 url = entry.url | 1785 url = entry.url |
| 1768 except pysvn.ClientError: | 1786 except pysvn.ClientError: |
| 1769 url = "" | 1787 url = "" |
| 1770 return url | 1788 return url |
| 1771 | 1789 |
| 1772 def svnResolve(self, name): | 1790 def vcsResolved(self, name): |
| 1773 """ | 1791 """ |
| 1774 Public method used to resolve conflicts of a file/directory. | 1792 Public method used to resolve conflicts of a file/directory. |
| 1775 | 1793 |
| 1776 @param name file/directory name to be resolved (string) | 1794 @param name file/directory name to be resolved (string) |
| 1777 """ | 1795 """ |
| 2134 except pysvn.ClientError as e: | 2152 except pysvn.ClientError as e: |
| 2135 error = str(e) | 2153 error = str(e) |
| 2136 | 2154 |
| 2137 return output, error | 2155 return output, error |
| 2138 | 2156 |
| 2139 def svnSbsDiff(self, name, extended=False, revisions=None): | 2157 def vcsSbsDiff(self, name, extended=False, revisions=None): |
| 2140 """ | 2158 """ |
| 2141 Public method used to view the difference of a file to the Mercurial | 2159 Public method used to view the difference of a file to the Mercurial |
| 2142 repository side-by-side. | 2160 repository side-by-side. |
| 2143 | 2161 |
| 2144 @param name file name to be diffed (string) | 2162 @param name file name to be diffed (string) |
