Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py
Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 87
- 4cc5c8d1184d
- parent 71
- f21321d97145
- child 96
- 9624a110667d
equal
deleted
inserted
replaced
| 86:778f405e9411 | 87:4cc5c8d1184d |
|---|---|
| 644 cwd = os.getcwd() | 644 cwd = os.getcwd() |
| 645 os.chdir(wdir) | 645 os.chdir(wdir) |
| 646 opts = self.options['global'] + self.options['add'] | 646 opts = self.options['global'] + self.options['add'] |
| 647 recurse = False | 647 recurse = False |
| 648 force = "--force" in opts or noDialog | 648 force = "--force" in opts or noDialog |
| 649 ignore = "--ignore" in opts | 649 noignore = "--no-ignore" in opts |
| 650 client = self.getClient() | 650 client = self.getClient() |
| 651 if not noDialog: | 651 if not noDialog: |
| 652 dlg = \ | 652 dlg = \ |
| 653 SvnDialog(\ | 653 SvnDialog(\ |
| 654 self.trUtf8('Adding files/directories to the Subversion repository'), | 654 self.trUtf8('Adding files/directories to the Subversion repository'), |
| 655 "add --non-recursive%s%s %s" % \ | 655 "add --non-recursive%s%s %s" % \ |
| 656 (force and " --force" or "", | 656 (force and " --force" or "", |
| 657 ignore and " --ignore" or "", | 657 noignore and " --no-ignore" or "", |
| 658 " ".join(names)), | 658 " ".join(names)), |
| 659 client) | 659 client) |
| 660 QApplication.processEvents() | 660 QApplication.processEvents() |
| 661 try: | 661 try: |
| 662 client.add(names, recurse = recurse, force = force, ignore = ignore) | 662 client.add(names, recurse = recurse, force = force, ignore = not noignore) |
| 663 except pysvn.ClientError as e: | 663 except pysvn.ClientError as e: |
| 664 if not noDialog: | 664 if not noDialog: |
| 665 dlg.showError(e.args[0]) | 665 dlg.showError(e.args[0]) |
| 666 locker.unlock() | 666 locker.unlock() |
| 667 if not noDialog: | 667 if not noDialog: |
