Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 564
- b3d966393ba9
- parent 537
- 72b32daeb8d6
- child 791
- 9ec2ac20e54e
equal
deleted
inserted
replaced
| 563:e35d2cda9a74 | 564:b3d966393ba9 |
|---|---|
| 331 if self.otherData["standardLayout"]: | 331 if self.otherData["standardLayout"]: |
| 332 if tag is None or tag == '': | 332 if tag is None or tag == '': |
| 333 svnUrl = '{0}/trunk'.format(vcsDir) | 333 svnUrl = '{0}/trunk'.format(vcsDir) |
| 334 else: | 334 else: |
| 335 if not tag.startswith('tags') and not tag.startswith('branches'): | 335 if not tag.startswith('tags') and not tag.startswith('branches'): |
| 336 type, ok = QInputDialog.getItem(\ | 336 type, ok = QInputDialog.getItem( |
| 337 None, | 337 None, |
| 338 self.trUtf8("Subversion Checkout"), | 338 self.trUtf8("Subversion Checkout"), |
| 339 self.trUtf8("The tag must be a normal tag (tags) or" | 339 self.trUtf8("The tag must be a normal tag (tags) or" |
| 340 " a branch tag (branches)." | 340 " a branch tag (branches)." |
| 341 " Please select from the list."), | 341 " Please select from the list."), |
| 383 if self.otherData["standardLayout"]: | 383 if self.otherData["standardLayout"]: |
| 384 if tag is None or tag == '': | 384 if tag is None or tag == '': |
| 385 svnUrl = '{0}/trunk'.format(vcsDir) | 385 svnUrl = '{0}/trunk'.format(vcsDir) |
| 386 else: | 386 else: |
| 387 if not tag.startswith('tags') and not tag.startswith('branches'): | 387 if not tag.startswith('tags') and not tag.startswith('branches'): |
| 388 type, ok = QInputDialog.getItem(\ | 388 type, ok = QInputDialog.getItem( |
| 389 None, | 389 None, |
| 390 self.trUtf8("Subversion Export"), | 390 self.trUtf8("Subversion Export"), |
| 391 self.trUtf8("The tag must be a normal tag (tags) or" | 391 self.trUtf8("The tag must be a normal tag (tags) or" |
| 392 " a branch tag (branches)." | 392 " a branch tag (branches)." |
| 393 " Please select from the list."), | 393 " Please select from the list."), |
| 580 args.append(name) | 580 args.append(name) |
| 581 | 581 |
| 582 if noDialog: | 582 if noDialog: |
| 583 self.startSynchronizedProcess(QProcess(), "svn", args, wdir) | 583 self.startSynchronizedProcess(QProcess(), "svn", args, wdir) |
| 584 else: | 584 else: |
| 585 dia = SvnDialog(\ | 585 dia = SvnDialog( |
| 586 self.trUtf8('Adding files/directories to the Subversion repository')) | 586 self.trUtf8('Adding files/directories to the Subversion repository')) |
| 587 res = dia.startProcess(args, wdir) | 587 res = dia.startProcess(args, wdir) |
| 588 if res: | 588 if res: |
| 589 dia.exec_() | 589 dia.exec_() |
| 590 | 590 |
| 635 if isinstance(path, list): | 635 if isinstance(path, list): |
| 636 self.addArguments(args, path) | 636 self.addArguments(args, path) |
| 637 else: | 637 else: |
| 638 args.append(path) | 638 args.append(path) |
| 639 | 639 |
| 640 dia = SvnDialog(\ | 640 dia = SvnDialog( |
| 641 self.trUtf8('Adding directory trees to the Subversion repository')) | 641 self.trUtf8('Adding directory trees to the Subversion repository')) |
| 642 res = dia.startProcess(args, dname) | 642 res = dia.startProcess(args, dname) |
| 643 if res: | 643 if res: |
| 644 dia.exec_() | 644 dia.exec_() |
| 645 | 645 |
| 667 args.append(name) | 667 args.append(name) |
| 668 | 668 |
| 669 if noDialog: | 669 if noDialog: |
| 670 res = self.startSynchronizedProcess(QProcess(), "svn", args) | 670 res = self.startSynchronizedProcess(QProcess(), "svn", args) |
| 671 else: | 671 else: |
| 672 dia = SvnDialog(\ | 672 dia = SvnDialog( |
| 673 self.trUtf8('Removing files/directories from the Subversion repository')) | 673 self.trUtf8('Removing files/directories from the Subversion repository')) |
| 674 res = dia.startProcess(args) | 674 res = dia.startProcess(args) |
| 675 if res: | 675 if res: |
| 676 dia.exec_() | 676 dia.exec_() |
| 677 res = dia.normalExit() | 677 res = dia.normalExit() |
| 1416 Public method used to delete a property of a file/directory. | 1416 Public method used to delete a property of a file/directory. |
| 1417 | 1417 |
| 1418 @param name file/directory name (string or list of strings) | 1418 @param name file/directory name (string or list of strings) |
| 1419 @param recursive flag indicating a recursive list is requested | 1419 @param recursive flag indicating a recursive list is requested |
| 1420 """ | 1420 """ |
| 1421 propName, ok = QInputDialog.getText(\ | 1421 propName, ok = QInputDialog.getText( |
| 1422 None, | 1422 None, |
| 1423 self.trUtf8("Subversion Delete Property"), | 1423 self.trUtf8("Subversion Delete Property"), |
| 1424 self.trUtf8("Enter property name"), | 1424 self.trUtf8("Enter property name"), |
| 1425 QLineEdit.Normal) | 1425 QLineEdit.Normal) |
| 1426 | 1426 |
| 1565 Public method used to view the (limited) log of a file/directory from the | 1565 Public method used to view the (limited) log of a file/directory from the |
| 1566 Subversion repository. | 1566 Subversion repository. |
| 1567 | 1567 |
| 1568 @param name file/directory name to show the log of (string) | 1568 @param name file/directory name to show the log of (string) |
| 1569 """ | 1569 """ |
| 1570 noEntries, ok = QInputDialog.getInteger(\ | 1570 noEntries, ok = QInputDialog.getInteger( |
| 1571 None, | 1571 None, |
| 1572 self.trUtf8("Subversion Log"), | 1572 self.trUtf8("Subversion Log"), |
| 1573 self.trUtf8("Select number of entries to show."), | 1573 self.trUtf8("Select number of entries to show."), |
| 1574 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) | 1574 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) |
| 1575 if ok: | 1575 if ok: |
| 1671 url = self.svnGetReposName(projectPath) | 1671 url = self.svnGetReposName(projectPath) |
| 1672 else: | 1672 else: |
| 1673 url = None | 1673 url = None |
| 1674 | 1674 |
| 1675 if url is None: | 1675 if url is None: |
| 1676 url, ok = QInputDialog.getText(\ | 1676 url, ok = QInputDialog.getText( |
| 1677 None, | 1677 None, |
| 1678 self.trUtf8("Repository Browser"), | 1678 self.trUtf8("Repository Browser"), |
| 1679 self.trUtf8("Enter the repository URL."), | 1679 self.trUtf8("Enter the repository URL."), |
| 1680 QLineEdit.Normal) | 1680 QLineEdit.Normal) |
| 1681 if not ok or not url: | 1681 if not ok or not url: |
| 1718 Note: Directories will be added recursively. | 1718 Note: Directories will be added recursively. |
| 1719 | 1719 |
| 1720 @param names name or list of names of file or directory to add | 1720 @param names name or list of names of file or directory to add |
| 1721 (string) | 1721 (string) |
| 1722 """ | 1722 """ |
| 1723 clname, ok = QInputDialog.getText(\ | 1723 clname, ok = QInputDialog.getText( |
| 1724 None, | 1724 None, |
| 1725 self.trUtf8("Add to changelist"), | 1725 self.trUtf8("Add to changelist"), |
| 1726 self.trUtf8("Enter name of the changelist:"), | 1726 self.trUtf8("Enter name of the changelist:"), |
| 1727 QLineEdit.Normal) | 1727 QLineEdit.Normal) |
| 1728 if not ok or not clname: | 1728 if not ok or not clname: |
