Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py
eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py
- branch
- maintenance
- changeset 7919
- b53ea4decd93
- parent 7836
- 2f0d208b8137
- child 7924
- 8a96736d465e
equal
deleted
inserted
replaced
| 7918:f136c57fdf35 | 7919:b53ea4decd93 |
|---|---|
| 1355 output = str(process.readAllStandardOutput(), ioEncoding, | 1355 output = str(process.readAllStandardOutput(), ioEncoding, |
| 1356 'replace') | 1356 'replace') |
| 1357 for line in output.splitlines(): | 1357 for line in output.splitlines(): |
| 1358 match = self.rx_status1.fullmatch(line) | 1358 match = self.rx_status1.fullmatch(line) |
| 1359 if match is not None: | 1359 if match is not None: |
| 1360 flags = self.rx_status1.group(1) | 1360 flags = match.group(1) |
| 1361 path = self.rx_status1.group(5).strip() | 1361 path = match.group(5).strip() |
| 1362 else: | 1362 else: |
| 1363 match = self.rx_status2.fullmatch(line) | 1363 match = self.rx_status2.fullmatch(line) |
| 1364 if match is not None: | 1364 if match is not None: |
| 1365 flags = self.rx_status2.group(1) | 1365 flags = match.group(1) |
| 1366 path = self.rx_status2.group(2).strip() | 1366 path = match.group(2).strip() |
| 1367 else: | 1367 else: |
| 1368 continue | 1368 continue |
| 1369 name = os.path.normcase(path) | 1369 name = os.path.normcase(path) |
| 1370 if flags[0] not in "?I": | 1370 if flags[0] not in "?I": |
| 1371 if name in names: | 1371 if name in names: |
| 1424 output = str(process.readAllStandardOutput(), ioEncoding, | 1424 output = str(process.readAllStandardOutput(), ioEncoding, |
| 1425 'replace') | 1425 'replace') |
| 1426 for line in output.splitlines(): | 1426 for line in output.splitlines(): |
| 1427 match = self.rx_status1.fullmatch(line) | 1427 match = self.rx_status1.fullmatch(line) |
| 1428 if match is not None: | 1428 if match is not None: |
| 1429 flags = self.rx_status1.group(1) | 1429 flags = match.group(1) |
| 1430 path = self.rx_status1.group(5).strip() | 1430 path = match.group(5).strip() |
| 1431 else: | 1431 else: |
| 1432 match = self.rx_status2.fullmatch(line) | 1432 match = self.rx_status2.fullmatch(line) |
| 1433 if match is not None: | 1433 if match is not None: |
| 1434 flags = self.rx_status2.group(1) | 1434 flags = match.group(1) |
| 1435 path = self.rx_status2.group(2).strip() | 1435 path = match.group(2).strip() |
| 1436 else: | 1436 else: |
| 1437 continue | 1437 continue |
| 1438 name = os.path.normcase(path) | 1438 name = os.path.normcase(path) |
| 1439 if flags[0] not in "?I": | 1439 if flags[0] not in "?I": |
| 1440 if name in names: | 1440 if name in names: |
