Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py
eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py
- branch
- eric7
- changeset 8621
- 8c9f41115c04
- parent 8358
- 144a6b854f70
- child 8624
- 5192a2592324
equal
deleted
inserted
replaced
| 8620:84f7f7867b5f | 8621:8c9f41115c04 |
|---|---|
| 1032 | 1032 |
| 1033 def vcsRevert(self, name): | 1033 def vcsRevert(self, name): |
| 1034 """ | 1034 """ |
| 1035 Public method used to revert changes made to a file/directory. | 1035 Public method used to revert changes made to a file/directory. |
| 1036 | 1036 |
| 1037 @param name file/directory name to be reverted (string) | 1037 @param name file/directory name to be reverted |
| 1038 @type str | |
| 1039 @return flag indicating, that the update contained an add | |
| 1040 or delete | |
| 1041 @rtype bool | |
| 1038 """ | 1042 """ |
| 1039 args = [] | 1043 args = [] |
| 1040 args.append('revert') | 1044 args.append('revert') |
| 1041 self.addArguments(args, self.options['global']) | 1045 self.addArguments(args, self.options['global']) |
| 1042 if isinstance(name, list): | 1046 if isinstance(name, list): |
| 1071 dia = SvnDialog(self.tr('Reverting changes')) | 1075 dia = SvnDialog(self.tr('Reverting changes')) |
| 1072 res = dia.startProcess(args) | 1076 res = dia.startProcess(args) |
| 1073 if res: | 1077 if res: |
| 1074 dia.exec() | 1078 dia.exec() |
| 1075 self.checkVCSStatus() | 1079 self.checkVCSStatus() |
| 1080 | |
| 1081 return False | |
| 1082 | |
| 1083 def vcsForget(self, name): | |
| 1084 """ | |
| 1085 Public method used to remove a file from the repository. | |
| 1086 | |
| 1087 Note: svn does not support this operation. The method is implemented | |
| 1088 as a NoOp. | |
| 1089 | |
| 1090 @param name file/directory name to be removed | |
| 1091 @type str or list of str | |
| 1092 """ | |
| 1093 pass | |
| 1076 | 1094 |
| 1077 def vcsSwitch(self, name): | 1095 def vcsSwitch(self, name): |
| 1078 """ | 1096 """ |
| 1079 Public method used to switch a directory to a different tag/branch. | 1097 Public method used to switch a directory to a different tag/branch. |
| 1080 | 1098 |
| 1663 ) | 1681 ) |
| 1664 return reposURL | 1682 return reposURL |
| 1665 | 1683 |
| 1666 return "" | 1684 return "" |
| 1667 | 1685 |
| 1668 def svnResolve(self, name): | 1686 def vcsResolved(self, name): |
| 1669 """ | 1687 """ |
| 1670 Public method used to resolve conflicts of a file/directory. | 1688 Public method used to resolve conflicts of a file/directory. |
| 1671 | 1689 |
| 1672 @param name file/directory name to be resolved (string) | 1690 @param name file/directory name to be resolved (string) |
| 1673 """ | 1691 """ |
| 1988 'The process {0} could not be started. ' | 2006 'The process {0} could not be started. ' |
| 1989 'Ensure, that it is in the search path.').format('svn') | 2007 'Ensure, that it is in the search path.').format('svn') |
| 1990 | 2008 |
| 1991 return output, error | 2009 return output, error |
| 1992 | 2010 |
| 1993 def svnSbsDiff(self, name, extended=False, revisions=None): | 2011 def vcsSbsDiff(self, name, extended=False, revisions=None): |
| 1994 """ | 2012 """ |
| 1995 Public method used to view the difference of a file to the Mercurial | 2013 Public method used to view the difference of a file to the Mercurial |
| 1996 repository side-by-side. | 2014 repository side-by-side. |
| 1997 | 2015 |
| 1998 @param name file name to be diffed (string) | 2016 @param name file name to be diffed (string) |
