Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 42
- 23b45a742e17
- parent 15
- f6ccc31d6e72
- child 53
- c3eb7cc1ff8b
equal
deleted
inserted
replaced
| 41:572a009369f0 | 42:23b45a742e17 |
|---|---|
| 715 args.append('--force') | 715 args.append('--force') |
| 716 if rx_prot.exactMatch(target): | 716 if rx_prot.exactMatch(target): |
| 717 args.append('--message') | 717 args.append('--message') |
| 718 args.append('Moving {0} to {1}'.format(name, target)) | 718 args.append('Moving {0} to {1}'.format(name, target)) |
| 719 target = self.__svnURL(target) | 719 target = self.__svnURL(target) |
| 720 else: | |
| 721 target = str(target) | |
| 722 args.append(name) | 720 args.append(name) |
| 723 args.append(target) | 721 args.append(target) |
| 724 | 722 |
| 725 if noDialog: | 723 if noDialog: |
| 726 res = self.startSynchronizedProcess(QProcess(), "svn", args) | 724 res = self.startSynchronizedProcess(QProcess(), "svn", args) |
| 1085 if finished and process.exitCode() == 0: | 1083 if finished and process.exitCode() == 0: |
| 1086 output = \ | 1084 output = \ |
| 1087 str(process.readAllStandardOutput(), ioEncoding, 'replace') | 1085 str(process.readAllStandardOutput(), ioEncoding, 'replace') |
| 1088 for line in output.splitlines(): | 1086 for line in output.splitlines(): |
| 1089 if self.rx_status1.exactMatch(line): | 1087 if self.rx_status1.exactMatch(line): |
| 1090 flags = str(self.rx_status1.cap(1)) | 1088 flags = self.rx_status1.cap(1) |
| 1091 path = self.rx_status1.cap(5).strip() | 1089 path = self.rx_status1.cap(5).strip() |
| 1092 elif self.rx_status2.exactMatch(line): | 1090 elif self.rx_status2.exactMatch(line): |
| 1093 flags = str(self.rx_status2.cap(1)) | 1091 flags = self.rx_status2.cap(1) |
| 1094 path = self.rx_status2.cap(2).strip() | 1092 path = self.rx_status2.cap(2).strip() |
| 1095 else: | 1093 else: |
| 1096 continue | 1094 continue |
| 1097 name = os.path.normcase(path) | 1095 name = os.path.normcase(path) |
| 1098 if flags[0] not in "?I": | 1096 if flags[0] not in "?I": |
