Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/subversion.py
Plugins/VcsPlugins/vcsSubversion/subversion.py
- changeset 4126
- c28d0cf3b639
- parent 4072
- 46fb585f60f2
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4125:056d98a54dd4 | 4126:c28d0cf3b639 |
|---|---|
| 902 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) | 902 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) |
| 903 if ok: | 903 if ok: |
| 904 from .SvnLogDialog import SvnLogDialog | 904 from .SvnLogDialog import SvnLogDialog |
| 905 self.log = SvnLogDialog(self, isFile=isFile) | 905 self.log = SvnLogDialog(self, isFile=isFile) |
| 906 self.log.show() | 906 self.log.show() |
| 907 self.log.raise_() | |
| 907 self.log.start(name, noEntries) | 908 self.log.start(name, noEntries) |
| 908 | 909 |
| 909 def vcsDiff(self, name): | 910 def vcsDiff(self, name): |
| 910 """ | 911 """ |
| 911 Public method used to view the difference of a file/directory to the | 912 Public method used to view the difference of a file/directory to the |
| 929 return | 930 return |
| 930 else: | 931 else: |
| 931 project = e5App().getObject("Project") | 932 project = e5App().getObject("Project") |
| 932 if nam == project.ppath and not project.saveAllScripts(): | 933 if nam == project.ppath and not project.saveAllScripts(): |
| 933 return | 934 return |
| 934 from .SvnDiffDialog import SvnDiffDialog | 935 if self.diff is None: |
| 935 self.diff = SvnDiffDialog(self) | 936 from .SvnDiffDialog import SvnDiffDialog |
| 937 self.diff = SvnDiffDialog(self) | |
| 936 self.diff.show() | 938 self.diff.show() |
| 939 self.diff.raise_() | |
| 937 QApplication.processEvents() | 940 QApplication.processEvents() |
| 938 self.diff.start(name, refreshable=True) | 941 self.diff.start(name, refreshable=True) |
| 939 | 942 |
| 940 def vcsStatus(self, name): | 943 def vcsStatus(self, name): |
| 941 """ | 944 """ |
| 943 Subversion repository. | 946 Subversion repository. |
| 944 | 947 |
| 945 @param name file/directory name(s) to show the status of | 948 @param name file/directory name(s) to show the status of |
| 946 (string or list of strings) | 949 (string or list of strings) |
| 947 """ | 950 """ |
| 948 from .SvnStatusDialog import SvnStatusDialog | 951 if self.status is None: |
| 949 self.status = SvnStatusDialog(self) | 952 from .SvnStatusDialog import SvnStatusDialog |
| 953 self.status = SvnStatusDialog(self) | |
| 950 self.status.show() | 954 self.status.show() |
| 955 self.status.raise_() | |
| 951 self.status.start(name) | 956 self.status.start(name) |
| 952 | 957 |
| 953 def vcsTag(self, name): | 958 def vcsTag(self, name): |
| 954 """ | 959 """ |
| 955 Public method used to set the tag of a file/directory in the | 960 Public method used to set the tag of a file/directory in the |
| 1723 Public method used to list the properties of a file/directory. | 1728 Public method used to list the properties of a file/directory. |
| 1724 | 1729 |
| 1725 @param name file/directory name (string or list of strings) | 1730 @param name file/directory name (string or list of strings) |
| 1726 @param recursive flag indicating a recursive list is requested | 1731 @param recursive flag indicating a recursive list is requested |
| 1727 """ | 1732 """ |
| 1728 from .SvnPropListDialog import SvnPropListDialog | 1733 if self.propList is None: |
| 1729 self.propList = SvnPropListDialog(self) | 1734 from .SvnPropListDialog import SvnPropListDialog |
| 1735 self.propList = SvnPropListDialog(self) | |
| 1730 self.propList.show() | 1736 self.propList.show() |
| 1737 self.propList.raise_() | |
| 1731 self.propList.start(name, recursive) | 1738 self.propList.start(name, recursive) |
| 1732 | 1739 |
| 1733 def svnSetProp(self, name, recursive=False): | 1740 def svnSetProp(self, name, recursive=False): |
| 1734 """ | 1741 """ |
| 1735 Public method used to add a property to a file/directory. | 1742 Public method used to add a property to a file/directory. |
| 1818 | 1825 |
| 1819 @param path directory name of the project (string) | 1826 @param path directory name of the project (string) |
| 1820 @param tags flag indicating listing of branches or tags | 1827 @param tags flag indicating listing of branches or tags |
| 1821 (False = branches, True = tags) | 1828 (False = branches, True = tags) |
| 1822 """ | 1829 """ |
| 1823 from .SvnTagBranchListDialog import SvnTagBranchListDialog | 1830 if self.tagbranchList is None: |
| 1824 self.tagbranchList = SvnTagBranchListDialog(self) | 1831 from .SvnTagBranchListDialog import SvnTagBranchListDialog |
| 1832 self.tagbranchList = SvnTagBranchListDialog(self) | |
| 1825 self.tagbranchList.show() | 1833 self.tagbranchList.show() |
| 1834 self.tagbranchList.raise_() | |
| 1826 if tags: | 1835 if tags: |
| 1827 if not self.showedTags: | 1836 if not self.showedTags: |
| 1828 self.showedTags = True | 1837 self.showedTags = True |
| 1829 allTagsBranchesList = self.allTagsBranchesList | 1838 allTagsBranchesList = self.allTagsBranchesList |
| 1830 else: | 1839 else: |
| 1846 """ | 1855 """ |
| 1847 Public method to show the output of the svn blame command. | 1856 Public method to show the output of the svn blame command. |
| 1848 | 1857 |
| 1849 @param name file name to show the blame for (string) | 1858 @param name file name to show the blame for (string) |
| 1850 """ | 1859 """ |
| 1851 from .SvnBlameDialog import SvnBlameDialog | 1860 if self.blame is None: |
| 1852 self.blame = SvnBlameDialog(self) | 1861 from .SvnBlameDialog import SvnBlameDialog |
| 1862 self.blame = SvnBlameDialog(self) | |
| 1853 self.blame.show() | 1863 self.blame.show() |
| 1864 self.blame.raise_() | |
| 1854 self.blame.start(name) | 1865 self.blame.start(name) |
| 1855 | 1866 |
| 1856 def svnExtendedDiff(self, name): | 1867 def svnExtendedDiff(self, name): |
| 1857 """ | 1868 """ |
| 1858 Public method used to view the difference of a file/directory to the | 1869 Public method used to view the difference of a file/directory to the |
| 2035 | 2046 |
| 2036 if self.sbsDiff is None: | 2047 if self.sbsDiff is None: |
| 2037 from UI.CompareDialog import CompareDialog | 2048 from UI.CompareDialog import CompareDialog |
| 2038 self.sbsDiff = CompareDialog() | 2049 self.sbsDiff = CompareDialog() |
| 2039 self.sbsDiff.show() | 2050 self.sbsDiff.show() |
| 2051 self.sbsDiff.raise_() | |
| 2040 self.sbsDiff.compare(output1, output2, name1, name2) | 2052 self.sbsDiff.compare(output1, output2, name1, name2) |
| 2041 | 2053 |
| 2042 def vcsLogBrowser(self, name, isFile=False): | 2054 def vcsLogBrowser(self, name, isFile=False): |
| 2043 """ | 2055 """ |
| 2044 Public method used to browse the log of a file/directory from the | 2056 Public method used to browse the log of a file/directory from the |
| 2049 """ | 2061 """ |
| 2050 if self.logBrowser is None: | 2062 if self.logBrowser is None: |
| 2051 from .SvnLogBrowserDialog import SvnLogBrowserDialog | 2063 from .SvnLogBrowserDialog import SvnLogBrowserDialog |
| 2052 self.logBrowser = SvnLogBrowserDialog(self) | 2064 self.logBrowser = SvnLogBrowserDialog(self) |
| 2053 self.logBrowser.show() | 2065 self.logBrowser.show() |
| 2066 self.logBrowser.raise_() | |
| 2054 self.logBrowser.start(name, isFile=isFile) | 2067 self.logBrowser.start(name, isFile=isFile) |
| 2055 | 2068 |
| 2056 def svnLock(self, name, stealIt=False, parent=None): | 2069 def svnLock(self, name, stealIt=False, parent=None): |
| 2057 """ | 2070 """ |
| 2058 Public method used to lock a file in the Subversion repository. | 2071 Public method used to lock a file in the Subversion repository. |
| 2151 self.tr("Enter the repository URL."), | 2164 self.tr("Enter the repository URL."), |
| 2152 QLineEdit.Normal) | 2165 QLineEdit.Normal) |
| 2153 if not ok or not url: | 2166 if not ok or not url: |
| 2154 return | 2167 return |
| 2155 | 2168 |
| 2156 from .SvnRepoBrowserDialog import SvnRepoBrowserDialog | 2169 if self.repoBrowser is None: |
| 2157 self.repoBrowser = SvnRepoBrowserDialog(self) | 2170 from .SvnRepoBrowserDialog import SvnRepoBrowserDialog |
| 2171 self.repoBrowser = SvnRepoBrowserDialog(self) | |
| 2158 self.repoBrowser.show() | 2172 self.repoBrowser.show() |
| 2173 self.repoBrowser.raise_() | |
| 2159 self.repoBrowser.start(url) | 2174 self.repoBrowser.start(url) |
| 2160 | 2175 |
| 2161 def svnRemoveFromChangelist(self, names): | 2176 def svnRemoveFromChangelist(self, names): |
| 2162 """ | 2177 """ |
| 2163 Public method to remove a file or directory from its changelist. | 2178 Public method to remove a file or directory from its changelist. |
