Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py
eric6/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py
- changeset 7262
- c4b5f3393d63
- parent 7229
- 53054eb5b15a
- child 7360
- 9190402e4505
equal
deleted
inserted
replaced
| 7261:3ead033becb8 | 7262:c4b5f3393d63 |
|---|---|
| 76 reposRoot = rx_base.cap(1) | 76 reposRoot = rx_base.cap(1) |
| 77 self.repoRootLabel1.setText(reposRoot) | 77 self.repoRootLabel1.setText(reposRoot) |
| 78 self.repoRootLabel2.setText(reposRoot) | 78 self.repoRootLabel2.setText(reposRoot) |
| 79 else: | 79 else: |
| 80 project = e5App().getObject('Project') | 80 project = e5App().getObject('Project') |
| 81 if Utilities.normcasepath(path) != \ | 81 if ( |
| 82 Utilities.normcasepath(project.getProjectPath()): | 82 Utilities.normcasepath(path) != |
| 83 Utilities.normcasepath(project.getProjectPath()) | |
| 84 ): | |
| 83 path = project.getRelativePath(path) | 85 path = project.getRelativePath(path) |
| 84 reposURL = reposURL.replace(path, '') | 86 reposURL = reposURL.replace(path, '') |
| 85 self.repoRootLabel1.hide() | 87 self.repoRootLabel1.hide() |
| 86 self.typeCombo1.hide() | 88 self.typeCombo1.hide() |
| 87 self.labelCombo1.addItems([reposURL] + sorted(self.vcs.tagsList)) | 89 self.labelCombo1.addItems([reposURL] + sorted(self.vcs.tagsList)) |
| 141 | 143 |
| 142 @return tuple of list of two URL strings (list of strings) and | 144 @return tuple of list of two URL strings (list of strings) and |
| 143 a flag indicating a diff summary (boolean) | 145 a flag indicating a diff summary (boolean) |
| 144 """ | 146 """ |
| 145 if self.vcs.otherData["standardLayout"]: | 147 if self.vcs.otherData["standardLayout"]: |
| 146 url1 = self.repoRootLabel1.text() + \ | 148 url1 = ( |
| 147 self.typeCombo1.currentText() + \ | 149 self.repoRootLabel1.text() + |
| 150 self.typeCombo1.currentText() + | |
| 148 self.labelCombo1.currentText() | 151 self.labelCombo1.currentText() |
| 149 url2 = self.repoRootLabel2.text() + \ | 152 ) |
| 150 self.typeCombo2.currentText() + \ | 153 url2 = ( |
| 154 self.repoRootLabel2.text() + | |
| 155 self.typeCombo2.currentText() + | |
| 151 self.labelCombo2.currentText() | 156 self.labelCombo2.currentText() |
| 157 ) | |
| 152 else: | 158 else: |
| 153 url1 = self.labelCombo1.currentText() | 159 url1 = self.labelCombo1.currentText() |
| 154 url2 = self.labelCombo2.currentText() | 160 url2 = self.labelCombo2.currentText() |
| 155 | 161 |
| 156 return [url1, url2], self.summaryCheckBox.isChecked() | 162 return [url1, url2], self.summaryCheckBox.isChecked() |
