Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 1083
- dc680a0ce221
- parent 945
- 8cd4d08fa9f6
- child 1112
- 8a7d1b9d18db
equal
deleted
inserted
replaced
| 1082:8387830c1089 | 1083:dc680a0ce221 |
|---|---|
| 909 E5MessageBox.critical(self.__ui, | 909 E5MessageBox.critical(self.__ui, |
| 910 self.trUtf8("Subversion Error"), | 910 self.trUtf8("Subversion Error"), |
| 911 self.trUtf8("""The URL of the project repository could not be""" | 911 self.trUtf8("""The URL of the project repository could not be""" |
| 912 """ retrieved from the working copy. The switch operation will""" | 912 """ retrieved from the working copy. The switch operation will""" |
| 913 """ be aborted""")) | 913 """ be aborted""")) |
| 914 return | 914 return False |
| 915 | 915 |
| 916 if self.otherData["standardLayout"]: | 916 if self.otherData["standardLayout"]: |
| 917 url = None | 917 url = None |
| 918 else: | 918 else: |
| 919 url = self.svnNormalizeURL(reposURL) | 919 url = self.svnNormalizeURL(reposURL) |
| 923 tag, tagType = dlg.getParameters() | 923 tag, tagType = dlg.getParameters() |
| 924 if tag in self.allTagsBranchesList: | 924 if tag in self.allTagsBranchesList: |
| 925 self.allTagsBranchesList.remove(tag) | 925 self.allTagsBranchesList.remove(tag) |
| 926 self.allTagsBranchesList.insert(0, tag) | 926 self.allTagsBranchesList.insert(0, tag) |
| 927 else: | 927 else: |
| 928 return | 928 return False |
| 929 | 929 |
| 930 if self.otherData["standardLayout"]: | 930 if self.otherData["standardLayout"]: |
| 931 rx_base = QRegExp('(.+)/(trunk|tags|branches).*') | 931 rx_base = QRegExp('(.+)/(trunk|tags|branches).*') |
| 932 if not rx_base.exactMatch(reposURL): | 932 if not rx_base.exactMatch(reposURL): |
| 933 E5MessageBox.critical(self.__ui, | 933 E5MessageBox.critical(self.__ui, |
| 934 self.trUtf8("Subversion Error"), | 934 self.trUtf8("Subversion Error"), |
| 935 self.trUtf8("""The URL of the project repository has an""" | 935 self.trUtf8("""The URL of the project repository has an""" |
| 936 """ invalid format. The switch operation will""" | 936 """ invalid format. The switch operation will""" |
| 937 """ be aborted""")) | 937 """ be aborted""")) |
| 938 return | 938 return False |
| 939 | 939 |
| 940 reposRoot = rx_base.cap(1) | 940 reposRoot = rx_base.cap(1) |
| 941 tn = tag | 941 tn = tag |
| 942 if tagType == 1: | 942 if tagType == 1: |
| 943 url = '{0}/tags/{1}'.format(reposRoot, urllib.parse.quote(tag)) | 943 url = '{0}/tags/{1}'.format(reposRoot, urllib.parse.quote(tag)) |
| 961 dia = SvnDialog(self.trUtf8('Switching to {0}') | 961 dia = SvnDialog(self.trUtf8('Switching to {0}') |
| 962 .format(tn)) | 962 .format(tn)) |
| 963 res = dia.startProcess(args) | 963 res = dia.startProcess(args) |
| 964 if res: | 964 if res: |
| 965 dia.exec_() | 965 dia.exec_() |
| 966 res = dia.hasAddOrDelete() | |
| 967 self.checkVCSStatus() | |
| 968 return res | |
| 966 | 969 |
| 967 def vcsMerge(self, name): | 970 def vcsMerge(self, name): |
| 968 """ | 971 """ |
| 969 Public method used to merge a URL/revision into the local project. | 972 Public method used to merge a URL/revision into the local project. |
| 970 | 973 |
