Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 3037
- a417a0670a36
- parent 3034
- 7ce719013078
- child 3044
- a6cee59c80a4
equal
deleted
inserted
replaced
| 3036:30c81c9e88b8 | 3037:a417a0670a36 |
|---|---|
| 476 # check for commit of the project | 476 # check for commit of the project |
| 477 if os.path.isdir(nam): | 477 if os.path.isdir(nam): |
| 478 project = e5App().getObject("Project") | 478 project = e5App().getObject("Project") |
| 479 if nam == project.getProjectPath(): | 479 if nam == project.getProjectPath(): |
| 480 ok &= project.checkAllScriptsDirty( | 480 ok &= project.checkAllScriptsDirty( |
| 481 reportSyntaxErrors=True) and \ | 481 reportSyntaxErrors=True) and \ |
| 482 project.checkDirty() | 482 project.checkDirty() |
| 483 continue | 483 continue |
| 484 elif os.path.isfile(nam): | 484 elif os.path.isfile(nam): |
| 485 editor = e5App().getObject("ViewManager")\ | 485 editor = e5App().getObject("ViewManager")\ |
| 486 .getOpenEditor(nam) | 486 .getOpenEditor(nam) |
| 649 os.path.join(repodir, self.adminDir)): | 649 os.path.join(repodir, self.adminDir)): |
| 650 repodir = os.path.dirname(repodir) | 650 repodir = os.path.dirname(repodir) |
| 651 if os.path.splitdrive(repodir)[1] == os.sep: | 651 if os.path.splitdrive(repodir)[1] == os.sep: |
| 652 return # oops, project is not version controlled | 652 return # oops, project is not version controlled |
| 653 while os.path.normcase(d) != \ | 653 while os.path.normcase(d) != \ |
| 654 os.path.normcase(repodir) and \ | 654 os.path.normcase(repodir) and \ |
| 655 (d not in tree2 + tree) and \ | 655 (d not in tree2 + tree) and \ |
| 656 (os.path.normcase(d) not in self.statusCache or | 656 (os.path.normcase(d) not in self.statusCache or |
| 657 self.statusCache[os.path.normcase(d)] == | 657 self.statusCache[os.path.normcase(d)] == |
| 658 self.canBeAdded): | 658 self.canBeAdded): |
| 659 tree2.append(d) | 659 tree2.append(d) |
| 714 os.path.join(repodir, self.adminDir)): | 714 os.path.join(repodir, self.adminDir)): |
| 715 repodir = os.path.dirname(repodir) | 715 repodir = os.path.dirname(repodir) |
| 716 if os.path.splitdrive(repodir)[1] == os.sep: | 716 if os.path.splitdrive(repodir)[1] == os.sep: |
| 717 return # oops, project is not version controlled | 717 return # oops, project is not version controlled |
| 718 while os.path.normcase(d) != \ | 718 while os.path.normcase(d) != \ |
| 719 os.path.normcase(repodir) and \ | 719 os.path.normcase(repodir) and \ |
| 720 (d not in tree) and \ | 720 (d not in tree) and \ |
| 721 (os.path.normcase(d) not in self.statusCache or | 721 (os.path.normcase(d) not in self.statusCache or |
| 722 self.statusCache[os.path.normcase(d)] == | 722 self.statusCache[os.path.normcase(d)] == |
| 723 self.canBeAdded): | 723 self.canBeAdded): |
| 724 tree.append(d) | 724 tree.append(d) |
| 739 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 739 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 740 repodir = os.path.dirname(repodir) | 740 repodir = os.path.dirname(repodir) |
| 741 if os.path.splitdrive(repodir)[1] == os.sep: | 741 if os.path.splitdrive(repodir)[1] == os.sep: |
| 742 return # oops, project is not version controlled | 742 return # oops, project is not version controlled |
| 743 while os.path.normcase(dname) != \ | 743 while os.path.normcase(dname) != \ |
| 744 os.path.normcase(repodir) and \ | 744 os.path.normcase(repodir) and \ |
| 745 (os.path.normcase(dname) not in self.statusCache or | 745 (os.path.normcase(dname) not in self.statusCache or |
| 746 self.statusCache[os.path.normcase(dname)] == | 746 self.statusCache[os.path.normcase(dname)] == |
| 747 self.canBeAdded): | 747 self.canBeAdded): |
| 748 # add directories recursively, if they aren't in the | 748 # add directories recursively, if they aren't in the |
| 749 # repository already | 749 # repository already |
| 1595 """<tr><td><b>Committed revision</b></td><td>{3}</td></tr>""" | 1595 """<tr><td><b>Committed revision</b></td><td>{3}</td></tr>""" |
| 1596 """<tr><td><b>Committed date</b></td><td>{4}</td></tr>""" | 1596 """<tr><td><b>Committed date</b></td><td>{4}</td></tr>""" |
| 1597 """<tr><td><b>Comitted time</b></td><td>{5}</td></tr>""" | 1597 """<tr><td><b>Comitted time</b></td><td>{5}</td></tr>""" |
| 1598 """<tr><td><b>Last author</b></td><td>{6}</td></tr>""" | 1598 """<tr><td><b>Last author</b></td><td>{6}</td></tr>""" |
| 1599 """</table>""" | 1599 """</table>""" |
| 1600 )\ | 1600 ).format(self.versionStr, |
| 1601 .format(self.versionStr, | 1601 info['url'], |
| 1602 info['url'], | 1602 info['revision'], |
| 1603 info['revision'], | 1603 info['committed-rev'], |
| 1604 info['committed-rev'], | 1604 info['committed-date'], |
| 1605 info['committed-date'], | 1605 info['committed-time'], |
| 1606 info['committed-time'], | 1606 info['last-author']) |
| 1607 info['last-author']) | |
| 1608 | 1607 |
| 1609 ########################################################################### | 1608 ########################################################################### |
| 1610 ## Public Subversion specific methods are below. | 1609 ## Public Subversion specific methods are below. |
| 1611 ########################################################################### | 1610 ########################################################################### |
| 1612 | 1611 |
| 2019 E5MessageBox.critical( | 2018 E5MessageBox.critical( |
| 2020 self.__ui, | 2019 self.__ui, |
| 2021 self.trUtf8("Subversion Side-by-Side Difference"), | 2020 self.trUtf8("Subversion Side-by-Side Difference"), |
| 2022 self.trUtf8( | 2021 self.trUtf8( |
| 2023 """<p>The file <b>{0}</b> could not be read.</p>""") | 2022 """<p>The file <b>{0}</b> could not be read.</p>""") |
| 2024 .format(name)) | 2023 .format(name)) |
| 2025 return | 2024 return |
| 2026 | 2025 |
| 2027 if self.sbsDiff is None: | 2026 if self.sbsDiff is None: |
| 2028 from UI.CompareDialog import CompareDialog | 2027 from UI.CompareDialog import CompareDialog |
| 2029 self.sbsDiff = CompareDialog() | 2028 self.sbsDiff = CompareDialog() |
