Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/subversion.py
Plugins/VcsPlugins/vcsPySvn/subversion.py
- changeset 4126
- c28d0cf3b639
- parent 4072
- 46fb585f60f2
- child 4631
- 5c1a96925da4
equal
deleted
inserted
replaced
| 4125:056d98a54dd4 | 4126:c28d0cf3b639 |
|---|---|
| 982 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) | 982 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) |
| 983 if ok: | 983 if ok: |
| 984 from .SvnLogDialog import SvnLogDialog | 984 from .SvnLogDialog import SvnLogDialog |
| 985 self.log = SvnLogDialog(self, isFile=isFile) | 985 self.log = SvnLogDialog(self, isFile=isFile) |
| 986 self.log.show() | 986 self.log.show() |
| 987 self.log.raise_() | |
| 987 QApplication.processEvents() | 988 QApplication.processEvents() |
| 988 self.log.start(name, noEntries) | 989 self.log.start(name, noEntries) |
| 989 | 990 |
| 990 def vcsDiff(self, name): | 991 def vcsDiff(self, name): |
| 991 """ | 992 """ |
| 1010 return | 1011 return |
| 1011 else: | 1012 else: |
| 1012 project = e5App().getObject("Project") | 1013 project = e5App().getObject("Project") |
| 1013 if nam == project.ppath and not project.saveAllScripts(): | 1014 if nam == project.ppath and not project.saveAllScripts(): |
| 1014 return | 1015 return |
| 1015 from .SvnDiffDialog import SvnDiffDialog | 1016 if self.diff is None: |
| 1016 self.diff = SvnDiffDialog(self) | 1017 from .SvnDiffDialog import SvnDiffDialog |
| 1018 self.diff = SvnDiffDialog(self) | |
| 1017 self.diff.show() | 1019 self.diff.show() |
| 1020 self.diff.raise_() | |
| 1018 QApplication.processEvents() | 1021 QApplication.processEvents() |
| 1019 self.diff.start(name, refreshable=True) | 1022 self.diff.start(name, refreshable=True) |
| 1020 | 1023 |
| 1021 def vcsStatus(self, name): | 1024 def vcsStatus(self, name): |
| 1022 """ | 1025 """ |
| 1024 Subversion repository. | 1027 Subversion repository. |
| 1025 | 1028 |
| 1026 @param name file/directory name(s) to show the status of | 1029 @param name file/directory name(s) to show the status of |
| 1027 (string or list of strings) | 1030 (string or list of strings) |
| 1028 """ | 1031 """ |
| 1029 from .SvnStatusDialog import SvnStatusDialog | 1032 if self.status is None: |
| 1030 self.status = SvnStatusDialog(self) | 1033 from .SvnStatusDialog import SvnStatusDialog |
| 1034 self.status = SvnStatusDialog(self) | |
| 1031 self.status.show() | 1035 self.status.show() |
| 1036 self.status.raise_() | |
| 1032 QApplication.processEvents() | 1037 QApplication.processEvents() |
| 1033 self.status.start(name) | 1038 self.status.start(name) |
| 1034 | 1039 |
| 1035 def vcsTag(self, name): | 1040 def vcsTag(self, name): |
| 1036 """ | 1041 """ |
| 1871 Public method used to list the properties of a file/directory. | 1876 Public method used to list the properties of a file/directory. |
| 1872 | 1877 |
| 1873 @param name file/directory name (string or list of strings) | 1878 @param name file/directory name (string or list of strings) |
| 1874 @param recursive flag indicating a recursive list is requested | 1879 @param recursive flag indicating a recursive list is requested |
| 1875 """ | 1880 """ |
| 1876 from .SvnPropListDialog import SvnPropListDialog | 1881 if self.propList is None: |
| 1877 self.propList = SvnPropListDialog(self) | 1882 from .SvnPropListDialog import SvnPropListDialog |
| 1883 self.propList = SvnPropListDialog(self) | |
| 1878 self.propList.show() | 1884 self.propList.show() |
| 1885 self.propList.raise_() | |
| 1879 QApplication.processEvents() | 1886 QApplication.processEvents() |
| 1880 self.propList.start(name, recursive) | 1887 self.propList.start(name, recursive) |
| 1881 | 1888 |
| 1882 def svnSetProp(self, name, recursive=False): | 1889 def svnSetProp(self, name, recursive=False): |
| 1883 """ | 1890 """ |
| 1991 | 1998 |
| 1992 @param path directory name of the project (string) | 1999 @param path directory name of the project (string) |
| 1993 @param tags flag indicating listing of branches or tags | 2000 @param tags flag indicating listing of branches or tags |
| 1994 (False = branches, True = tags) | 2001 (False = branches, True = tags) |
| 1995 """ | 2002 """ |
| 1996 from .SvnTagBranchListDialog import SvnTagBranchListDialog | 2003 if self.tagbranchList is None: |
| 1997 self.tagbranchList = SvnTagBranchListDialog(self) | 2004 from .SvnTagBranchListDialog import SvnTagBranchListDialog |
| 2005 self.tagbranchList = SvnTagBranchListDialog(self) | |
| 1998 self.tagbranchList.show() | 2006 self.tagbranchList.show() |
| 2007 self.tagbranchList.raise_() | |
| 1999 QApplication.processEvents() | 2008 QApplication.processEvents() |
| 2000 res = self.tagbranchList.start(path, tags) | 2009 res = self.tagbranchList.start(path, tags) |
| 2001 if res: | 2010 if res: |
| 2002 if tags: | 2011 if tags: |
| 2003 self.tagsList = self.tagbranchList.getTagList() | 2012 self.tagsList = self.tagbranchList.getTagList() |
| 2016 """ | 2025 """ |
| 2017 Public method to show the output of the svn blame command. | 2026 Public method to show the output of the svn blame command. |
| 2018 | 2027 |
| 2019 @param name file name to show the blame for (string) | 2028 @param name file name to show the blame for (string) |
| 2020 """ | 2029 """ |
| 2021 from .SvnBlameDialog import SvnBlameDialog | 2030 if self.blame is None: |
| 2022 self.blame = SvnBlameDialog(self) | 2031 from .SvnBlameDialog import SvnBlameDialog |
| 2032 self.blame = SvnBlameDialog(self) | |
| 2023 self.blame.show() | 2033 self.blame.show() |
| 2034 self.blame.raise_() | |
| 2024 QApplication.processEvents() | 2035 QApplication.processEvents() |
| 2025 self.blame.start(name) | 2036 self.blame.start(name) |
| 2026 | 2037 |
| 2027 def svnExtendedDiff(self, name): | 2038 def svnExtendedDiff(self, name): |
| 2028 """ | 2039 """ |
| 2053 return | 2064 return |
| 2054 from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog | 2065 from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog |
| 2055 dlg = SvnRevisionSelectionDialog() | 2066 dlg = SvnRevisionSelectionDialog() |
| 2056 if dlg.exec_() == QDialog.Accepted: | 2067 if dlg.exec_() == QDialog.Accepted: |
| 2057 revisions = dlg.getRevisions() | 2068 revisions = dlg.getRevisions() |
| 2058 from .SvnDiffDialog import SvnDiffDialog | 2069 if self.diff is None: |
| 2059 self.diff = SvnDiffDialog(self) | 2070 from .SvnDiffDialog import SvnDiffDialog |
| 2071 self.diff = SvnDiffDialog(self) | |
| 2060 self.diff.show() | 2072 self.diff.show() |
| 2073 self.diff.raise_() | |
| 2061 QApplication.processEvents() | 2074 QApplication.processEvents() |
| 2062 self.diff.start(name, revisions) | 2075 self.diff.start(name, revisions) |
| 2063 | 2076 |
| 2064 def svnUrlDiff(self, name): | 2077 def svnUrlDiff(self, name): |
| 2065 """ | 2078 """ |
| 2094 from .SvnUrlSelectionDialog import SvnUrlSelectionDialog | 2107 from .SvnUrlSelectionDialog import SvnUrlSelectionDialog |
| 2095 dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, | 2108 dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, |
| 2096 dname) | 2109 dname) |
| 2097 if dlg.exec_() == QDialog.Accepted: | 2110 if dlg.exec_() == QDialog.Accepted: |
| 2098 urls, summary = dlg.getURLs() | 2111 urls, summary = dlg.getURLs() |
| 2099 from .SvnDiffDialog import SvnDiffDialog | 2112 if self.diff is None: |
| 2100 self.diff = SvnDiffDialog(self) | 2113 from .SvnDiffDialog import SvnDiffDialog |
| 2114 self.diff = SvnDiffDialog(self) | |
| 2101 self.diff.show() | 2115 self.diff.show() |
| 2116 self.diff.raise_() | |
| 2102 QApplication.processEvents() | 2117 QApplication.processEvents() |
| 2103 self.diff.start(name, urls=urls, summary=summary) | 2118 self.diff.start(name, urls=urls, summary=summary) |
| 2104 | 2119 |
| 2105 def __svnGetFileForRevision(self, name, rev=""): | 2120 def __svnGetFileForRevision(self, name, rev=""): |
| 2106 """ | 2121 """ |
| 2207 | 2222 |
| 2208 if self.sbsDiff is None: | 2223 if self.sbsDiff is None: |
| 2209 from UI.CompareDialog import CompareDialog | 2224 from UI.CompareDialog import CompareDialog |
| 2210 self.sbsDiff = CompareDialog() | 2225 self.sbsDiff = CompareDialog() |
| 2211 self.sbsDiff.show() | 2226 self.sbsDiff.show() |
| 2227 self.sbsDiff.raise_() | |
| 2212 self.sbsDiff.compare(output1, output2, name1, name2) | 2228 self.sbsDiff.compare(output1, output2, name1, name2) |
| 2213 | 2229 |
| 2214 def vcsLogBrowser(self, name, isFile=False): | 2230 def vcsLogBrowser(self, name, isFile=False): |
| 2215 """ | 2231 """ |
| 2216 Public method used to browse the log of a file/directory from the | 2232 Public method used to browse the log of a file/directory from the |
| 2221 """ | 2237 """ |
| 2222 if self.logBrowser is None: | 2238 if self.logBrowser is None: |
| 2223 from .SvnLogBrowserDialog import SvnLogBrowserDialog | 2239 from .SvnLogBrowserDialog import SvnLogBrowserDialog |
| 2224 self.logBrowser = SvnLogBrowserDialog(self) | 2240 self.logBrowser = SvnLogBrowserDialog(self) |
| 2225 self.logBrowser.show() | 2241 self.logBrowser.show() |
| 2242 self.logBrowser.raise_() | |
| 2226 QApplication.processEvents() | 2243 QApplication.processEvents() |
| 2227 self.logBrowser.start(name, isFile=isFile) | 2244 self.logBrowser.start(name, isFile=isFile) |
| 2228 | 2245 |
| 2229 def svnLock(self, name, stealIt=False, parent=None): | 2246 def svnLock(self, name, stealIt=False, parent=None): |
| 2230 """ | 2247 """ |
| 2376 self.tr("Enter the repository URL."), | 2393 self.tr("Enter the repository URL."), |
| 2377 QLineEdit.Normal) | 2394 QLineEdit.Normal) |
| 2378 if not ok or not url: | 2395 if not ok or not url: |
| 2379 return | 2396 return |
| 2380 | 2397 |
| 2381 from .SvnRepoBrowserDialog import SvnRepoBrowserDialog | 2398 if self.repoBrowser is None: |
| 2382 self.repoBrowser = SvnRepoBrowserDialog(self) | 2399 from .SvnRepoBrowserDialog import SvnRepoBrowserDialog |
| 2400 self.repoBrowser = SvnRepoBrowserDialog(self) | |
| 2383 self.repoBrowser.start(url) | 2401 self.repoBrowser.start(url) |
| 2402 self.repoBrowser.show() | |
| 2403 self.repoBrowser.raise_() | |
| 2384 | 2404 |
| 2385 def svnRemoveFromChangelist(self, names): | 2405 def svnRemoveFromChangelist(self, names): |
| 2386 """ | 2406 """ |
| 2387 Public method to remove a file or directory from its changelist. | 2407 Public method to remove a file or directory from its changelist. |
| 2388 | 2408 |
