Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 5597
- 3d88d53f8c2b
- parent 5593
- 0f61eae74237
- child 5624
- cdd346d8858b
equal
deleted
inserted
replaced
| 5596:4550d8e34765 | 5597:3d88d53f8c2b |
|---|---|
| 348 if tag is None or tag == '': | 348 if tag is None or tag == '': |
| 349 svnUrl = '{0}/trunk'.format(vcsDir) | 349 svnUrl = '{0}/trunk'.format(vcsDir) |
| 350 else: | 350 else: |
| 351 if not tag.startswith('tags') and \ | 351 if not tag.startswith('tags') and \ |
| 352 not tag.startswith('branches'): | 352 not tag.startswith('branches'): |
| 353 type, ok = QInputDialog.getItem( | 353 tagType, ok = QInputDialog.getItem( |
| 354 None, | 354 None, |
| 355 self.tr("Subversion Checkout"), | 355 self.tr("Subversion Checkout"), |
| 356 self.tr( | 356 self.tr( |
| 357 "The tag must be a normal tag (tags) or" | 357 "The tag must be a normal tag (tags) or" |
| 358 " a branch tag (branches)." | 358 " a branch tag (branches)." |
| 359 " Please select from the list."), | 359 " Please select from the list."), |
| 360 self.tagTypeList, | 360 self.tagTypeList, |
| 361 0, False) | 361 0, False) |
| 362 if not ok: | 362 if not ok: |
| 363 return False | 363 return False |
| 364 tag = '{0}/{1}'.format(type, tag) | 364 tag = '{0}/{1}'.format(tagType, tag) |
| 365 svnUrl = '{0}/{1}'.format(vcsDir, tag) | 365 svnUrl = '{0}/{1}'.format(vcsDir, tag) |
| 366 else: | 366 else: |
| 367 svnUrl = vcsDir | 367 svnUrl = vcsDir |
| 368 | 368 |
| 369 args = [] | 369 args = [] |
| 404 if tag is None or tag == '': | 404 if tag is None or tag == '': |
| 405 svnUrl = '{0}/trunk'.format(vcsDir) | 405 svnUrl = '{0}/trunk'.format(vcsDir) |
| 406 else: | 406 else: |
| 407 if not tag.startswith('tags') and \ | 407 if not tag.startswith('tags') and \ |
| 408 not tag.startswith('branches'): | 408 not tag.startswith('branches'): |
| 409 type, ok = QInputDialog.getItem( | 409 tagType, ok = QInputDialog.getItem( |
| 410 None, | 410 None, |
| 411 self.tr("Subversion Export"), | 411 self.tr("Subversion Export"), |
| 412 self.tr( | 412 self.tr( |
| 413 "The tag must be a normal tag (tags) or" | 413 "The tag must be a normal tag (tags) or" |
| 414 " a branch tag (branches)." | 414 " a branch tag (branches)." |
| 415 " Please select from the list."), | 415 " Please select from the list."), |
| 416 self.tagTypeList, | 416 self.tagTypeList, |
| 417 0, False) | 417 0, False) |
| 418 if not ok: | 418 if not ok: |
| 419 return False | 419 return False |
| 420 tag = '{0}/{1}'.format(type, tag) | 420 tag = '{0}/{1}'.format(tagType, tag) |
| 421 svnUrl = '{0}/{1}'.format(vcsDir, tag) | 421 svnUrl = '{0}/{1}'.format(vcsDir, tag) |
| 422 else: | 422 else: |
| 423 svnUrl = vcsDir | 423 svnUrl = vcsDir |
| 424 | 424 |
| 425 args = [] | 425 args = [] |
