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