Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 4126
- c28d0cf3b639
- parent 4072
- 46fb585f60f2
- child 4409
- ff1cb0107d40
equal
deleted
inserted
replaced
| 4125:056d98a54dd4 | 4126:c28d0cf3b639 |
|---|---|
| 871 return | 871 return |
| 872 else: | 872 else: |
| 873 project = e5App().getObject("Project") | 873 project = e5App().getObject("Project") |
| 874 if nam == project.ppath and not project.saveAllScripts(): | 874 if nam == project.ppath and not project.saveAllScripts(): |
| 875 return | 875 return |
| 876 from .HgDiffDialog import HgDiffDialog | 876 if self.diff is None: |
| 877 self.diff = HgDiffDialog(self) | 877 from .HgDiffDialog import HgDiffDialog |
| 878 self.diff = HgDiffDialog(self) | |
| 878 self.diff.show() | 879 self.diff.show() |
| 880 self.diff.raise_() | |
| 879 QApplication.processEvents() | 881 QApplication.processEvents() |
| 880 self.diff.start(name, refreshable=True) | 882 self.diff.start(name, refreshable=True) |
| 881 | 883 |
| 882 def vcsStatus(self, name): | 884 def vcsStatus(self, name): |
| 883 """ | 885 """ |
| 885 Mercurial repository. | 887 Mercurial repository. |
| 886 | 888 |
| 887 @param name file/directory name(s) to show the status of | 889 @param name file/directory name(s) to show the status of |
| 888 (string or list of strings) | 890 (string or list of strings) |
| 889 """ | 891 """ |
| 890 from .HgStatusDialog import HgStatusDialog | 892 if self.status is None: |
| 891 self.status = HgStatusDialog(self) | 893 from .HgStatusDialog import HgStatusDialog |
| 894 self.status = HgStatusDialog(self) | |
| 892 self.status.show() | 895 self.status.show() |
| 896 self.status.raise_() | |
| 893 self.status.start(name) | 897 self.status.start(name) |
| 894 | 898 |
| 895 def hgSummary(self, mq=False, largefiles=False): | 899 def hgSummary(self, mq=False, largefiles=False): |
| 896 """ | 900 """ |
| 897 Public method used to show some summary information of the | 901 Public method used to show some summary information of the |
| 899 | 903 |
| 900 @param mq flag indicating to show the queue status as well (boolean) | 904 @param mq flag indicating to show the queue status as well (boolean) |
| 901 @param largefiles flag indicating to show the largefiles status as | 905 @param largefiles flag indicating to show the largefiles status as |
| 902 well (boolean) | 906 well (boolean) |
| 903 """ | 907 """ |
| 904 from .HgSummaryDialog import HgSummaryDialog | 908 if self.summary is None: |
| 905 self.summary = HgSummaryDialog(self) | 909 from .HgSummaryDialog import HgSummaryDialog |
| 910 self.summary = HgSummaryDialog(self) | |
| 906 self.summary.show() | 911 self.summary.show() |
| 912 self.summary.raise_() | |
| 907 self.summary.start(self.__projectHelper.getProject().getProjectPath(), | 913 self.summary.start(self.__projectHelper.getProject().getProjectPath(), |
| 908 mq=mq, largefiles=largefiles) | 914 mq=mq, largefiles=largefiles) |
| 909 | 915 |
| 910 def vcsTag(self, name, revision=None, tagName=None): | 916 def vcsTag(self, name, revision=None, tagName=None): |
| 911 """ | 917 """ |
| 1711 """ | 1717 """ |
| 1712 Public method to show the output of the hg annotate command. | 1718 Public method to show the output of the hg annotate command. |
| 1713 | 1719 |
| 1714 @param name file name to show the annotations for (string) | 1720 @param name file name to show the annotations for (string) |
| 1715 """ | 1721 """ |
| 1716 from .HgAnnotateDialog import HgAnnotateDialog | 1722 if self.annotate is None: |
| 1717 self.annotate = HgAnnotateDialog(self) | 1723 from .HgAnnotateDialog import HgAnnotateDialog |
| 1724 self.annotate = HgAnnotateDialog(self) | |
| 1718 self.annotate.show() | 1725 self.annotate.show() |
| 1726 self.annotate.raise_() | |
| 1719 self.annotate.start(name) | 1727 self.annotate.start(name) |
| 1720 | 1728 |
| 1721 def hgExtendedDiff(self, name): | 1729 def hgExtendedDiff(self, name): |
| 1722 """ | 1730 """ |
| 1723 Public method used to view the difference of a file/directory to the | 1731 Public method used to view the difference of a file/directory to the |
| 1759 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir), | 1767 dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir), |
| 1760 self.hgGetBranchesList(repodir), | 1768 self.hgGetBranchesList(repodir), |
| 1761 self.hgGetBookmarksList(repodir)) | 1769 self.hgGetBookmarksList(repodir)) |
| 1762 if dlg.exec_() == QDialog.Accepted: | 1770 if dlg.exec_() == QDialog.Accepted: |
| 1763 revisions = dlg.getRevisions() | 1771 revisions = dlg.getRevisions() |
| 1764 from .HgDiffDialog import HgDiffDialog | 1772 if self.diff is None: |
| 1765 self.diff = HgDiffDialog(self) | 1773 from .HgDiffDialog import HgDiffDialog |
| 1774 self.diff = HgDiffDialog(self) | |
| 1766 self.diff.show() | 1775 self.diff.show() |
| 1776 self.diff.raise_() | |
| 1767 self.diff.start(name, revisions) | 1777 self.diff.start(name, revisions) |
| 1768 | 1778 |
| 1769 def __hgGetFileForRevision(self, name, rev=""): | 1779 def __hgGetFileForRevision(self, name, rev=""): |
| 1770 """ | 1780 """ |
| 1771 Private method to get a file for a specific revision from the | 1781 Private method to get a file for a specific revision from the |
| 1885 | 1895 |
| 1886 if self.sbsDiff is None: | 1896 if self.sbsDiff is None: |
| 1887 from UI.CompareDialog import CompareDialog | 1897 from UI.CompareDialog import CompareDialog |
| 1888 self.sbsDiff = CompareDialog() | 1898 self.sbsDiff = CompareDialog() |
| 1889 self.sbsDiff.show() | 1899 self.sbsDiff.show() |
| 1900 self.sbsDiff.raise_() | |
| 1890 self.sbsDiff.compare(output1, output2, name1, name2) | 1901 self.sbsDiff.compare(output1, output2, name1, name2) |
| 1891 | 1902 |
| 1892 def vcsLogBrowser(self, name, isFile=False): | 1903 def vcsLogBrowser(self, name, isFile=False): |
| 1893 """ | 1904 """ |
| 1894 Public method used to browse the log of a file/directory from the | 1905 Public method used to browse the log of a file/directory from the |
| 1900 """ | 1911 """ |
| 1901 if self.logBrowser is None: | 1912 if self.logBrowser is None: |
| 1902 from .HgLogBrowserDialog import HgLogBrowserDialog | 1913 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 1903 self.logBrowser = HgLogBrowserDialog(self) | 1914 self.logBrowser = HgLogBrowserDialog(self) |
| 1904 self.logBrowser.show() | 1915 self.logBrowser.show() |
| 1916 self.logBrowser.raise_() | |
| 1905 self.logBrowser.start(name, isFile=isFile) | 1917 self.logBrowser.start(name, isFile=isFile) |
| 1906 | 1918 |
| 1907 def hgIncoming(self, name): | 1919 def hgIncoming(self, name): |
| 1908 """ | 1920 """ |
| 1909 Public method used to view the log of incoming changes from the | 1921 Public method used to view the log of incoming changes from the |
| 1915 if self.logBrowserIncoming is None: | 1927 if self.logBrowserIncoming is None: |
| 1916 from .HgLogBrowserDialog import HgLogBrowserDialog | 1928 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 1917 self.logBrowserIncoming = HgLogBrowserDialog( | 1929 self.logBrowserIncoming = HgLogBrowserDialog( |
| 1918 self, mode="incoming") | 1930 self, mode="incoming") |
| 1919 self.logBrowserIncoming.show() | 1931 self.logBrowserIncoming.show() |
| 1932 self.logBrowserIncoming.raise_() | |
| 1920 self.logBrowserIncoming.start(name) | 1933 self.logBrowserIncoming.start(name) |
| 1921 else: | 1934 else: |
| 1922 from .HgLogDialog import HgLogDialog | 1935 from .HgLogDialog import HgLogDialog |
| 1923 self.log = HgLogDialog(self, mode="incoming") | 1936 self.log = HgLogDialog(self, mode="incoming") |
| 1924 self.log.show() | 1937 self.log.show() |
| 1935 if self.logBrowserOutgoing is None: | 1948 if self.logBrowserOutgoing is None: |
| 1936 from .HgLogBrowserDialog import HgLogBrowserDialog | 1949 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 1937 self.logBrowserOutgoing = HgLogBrowserDialog( | 1950 self.logBrowserOutgoing = HgLogBrowserDialog( |
| 1938 self, mode="outgoing") | 1951 self, mode="outgoing") |
| 1939 self.logBrowserOutgoing.show() | 1952 self.logBrowserOutgoing.show() |
| 1953 self.logBrowserOutgoing.raise_() | |
| 1940 self.logBrowserOutgoing.start(name) | 1954 self.logBrowserOutgoing.start(name) |
| 1941 else: | 1955 else: |
| 1942 from .HgLogDialog import HgLogDialog | 1956 from .HgLogDialog import HgLogDialog |
| 1943 self.log = HgLogDialog(self, mode="outgoing") | 1957 self.log = HgLogDialog(self, mode="outgoing") |
| 1944 self.log.show() | 1958 self.log.show() |
| 2120 """ | 2134 """ |
| 2121 if self.conflictsDlg is None: | 2135 if self.conflictsDlg is None: |
| 2122 from .HgConflictsListDialog import HgConflictsListDialog | 2136 from .HgConflictsListDialog import HgConflictsListDialog |
| 2123 self.conflictsDlg = HgConflictsListDialog(self) | 2137 self.conflictsDlg = HgConflictsListDialog(self) |
| 2124 self.conflictsDlg.show() | 2138 self.conflictsDlg.show() |
| 2139 self.conflictsDlg.raise_() | |
| 2125 self.conflictsDlg.start(name) | 2140 self.conflictsDlg.start(name) |
| 2126 | 2141 |
| 2127 def hgResolved(self, name, unresolve=False): | 2142 def hgResolved(self, name, unresolve=False): |
| 2128 """ | 2143 """ |
| 2129 Public method used to resolve conflicts of a file/directory. | 2144 Public method used to resolve conflicts of a file/directory. |
| 2627 if self.logBrowserIncoming is None: | 2642 if self.logBrowserIncoming is None: |
| 2628 from .HgLogBrowserDialog import HgLogBrowserDialog | 2643 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 2629 self.logBrowserIncoming = \ | 2644 self.logBrowserIncoming = \ |
| 2630 HgLogBrowserDialog(self, mode="incoming") | 2645 HgLogBrowserDialog(self, mode="incoming") |
| 2631 self.logBrowserIncoming.show() | 2646 self.logBrowserIncoming.show() |
| 2647 self.logBrowserIncoming.raise_() | |
| 2632 self.logBrowserIncoming.start(name, bundle=file) | 2648 self.logBrowserIncoming.start(name, bundle=file) |
| 2633 else: | 2649 else: |
| 2634 from .HgLogDialog import HgLogDialog | 2650 from .HgLogDialog import HgLogDialog |
| 2635 self.log = HgLogDialog(self, mode="incoming", bundle=file) | 2651 self.log = HgLogDialog(self, mode="incoming", bundle=file) |
| 2636 self.log.show() | 2652 self.log.show() |
| 3516 | 3532 |
| 3517 @param path directory name of the project (string) | 3533 @param path directory name of the project (string) |
| 3518 """ | 3534 """ |
| 3519 self.bookmarksList = [] | 3535 self.bookmarksList = [] |
| 3520 | 3536 |
| 3521 from .HgBookmarksListDialog import HgBookmarksListDialog | 3537 if self.bookmarksListDlg is None: |
| 3522 self.bookmarksListDlg = HgBookmarksListDialog(self) | 3538 from .HgBookmarksListDialog import HgBookmarksListDialog |
| 3539 self.bookmarksListDlg = HgBookmarksListDialog(self) | |
| 3523 self.bookmarksListDlg.show() | 3540 self.bookmarksListDlg.show() |
| 3541 self.bookmarksListDlg.raise_() | |
| 3524 self.bookmarksListDlg.start(path, self.bookmarksList) | 3542 self.bookmarksListDlg.start(path, self.bookmarksList) |
| 3525 | 3543 |
| 3526 def hgGetBookmarksList(self, repodir): | 3544 def hgGetBookmarksList(self, repodir): |
| 3527 """ | 3545 """ |
| 3528 Public method to get the list of bookmarks. | 3546 Public method to get the list of bookmarks. |
