Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3283
- 2079b76a738b
- parent 3277
- b7d9c75223e3
- child 3290
- dbb53746813f
equal
deleted
inserted
replaced
| 3282:85177748df4d | 3283:2079b76a738b |
|---|---|
| 88 else: | 88 else: |
| 89 self.adminDir = '.hg' | 89 self.adminDir = '.hg' |
| 90 | 90 |
| 91 self.log = None | 91 self.log = None |
| 92 self.logBrowser = None | 92 self.logBrowser = None |
| 93 self.logBrowserIncoming = None | |
| 94 self.logBrowserOutgoing = None | |
| 93 self.diff = None | 95 self.diff = None |
| 94 self.sbsDiff = None | 96 self.sbsDiff = None |
| 95 self.status = None | 97 self.status = None |
| 96 self.summary = None | 98 self.summary = None |
| 97 self.tagbranchList = None | 99 self.tagbranchList = None |
| 158 """ | 160 """ |
| 159 if self.log is not None: | 161 if self.log is not None: |
| 160 self.log.close() | 162 self.log.close() |
| 161 if self.logBrowser is not None: | 163 if self.logBrowser is not None: |
| 162 self.logBrowser.close() | 164 self.logBrowser.close() |
| 165 if self.logBrowserIncoming is not None: | |
| 166 self.logBrowserIncoming.close() | |
| 167 if self.logBrowserOutgoing is not None: | |
| 168 self.logBrowserOutgoing.close() | |
| 163 if self.diff is not None: | 169 if self.diff is not None: |
| 164 self.diff.close() | 170 self.diff.close() |
| 165 if self.sbsDiff is not None: | 171 if self.sbsDiff is not None: |
| 166 self.sbsDiff.close() | 172 self.sbsDiff.close() |
| 167 if self.status is not None: | 173 if self.status is not None: |
| 1868 | 1874 |
| 1869 @param path file/directory name to show the log of (string) | 1875 @param path file/directory name to show the log of (string) |
| 1870 @keyparam isFile flag indicating log for a file is to be shown | 1876 @keyparam isFile flag indicating log for a file is to be shown |
| 1871 (boolean) | 1877 (boolean) |
| 1872 """ | 1878 """ |
| 1873 from .HgLogBrowserDialog import HgLogBrowserDialog | 1879 if self.logBrowser is None: |
| 1874 self.logBrowser = HgLogBrowserDialog(self, isFile=isFile) | 1880 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 1881 self.logBrowser = HgLogBrowserDialog(self) | |
| 1875 self.logBrowser.show() | 1882 self.logBrowser.show() |
| 1876 self.logBrowser.start(path) | 1883 self.logBrowser.start(path, isFile=isFile) |
| 1877 | 1884 |
| 1878 def hgIncoming(self, name): | 1885 def hgIncoming(self, name): |
| 1879 """ | 1886 """ |
| 1880 Public method used to view the log of incoming changes from the | 1887 Public method used to view the log of incoming changes from the |
| 1881 Mercurial repository. | 1888 Mercurial repository. |
| 1882 | 1889 |
| 1883 @param name file/directory name to show the log of (string) | 1890 @param name file/directory name to show the log of (string) |
| 1884 """ | 1891 """ |
| 1885 if self.getPlugin().getPreferences("UseLogBrowser"): | 1892 if self.getPlugin().getPreferences("UseLogBrowser"): |
| 1886 from .HgLogBrowserDialog import HgLogBrowserDialog | 1893 if self.logBrowserIncoming is None: |
| 1887 self.logBrowser = HgLogBrowserDialog(self, mode="incoming") | 1894 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 1888 self.logBrowser.show() | 1895 self.logBrowserIncoming = HgLogBrowserDialog(self, mode="incoming") |
| 1889 self.logBrowser.start(name) | 1896 self.logBrowserIncoming.show() |
| 1897 self.logBrowserIncoming.start(name) | |
| 1890 else: | 1898 else: |
| 1891 from .HgLogDialog import HgLogDialog | 1899 from .HgLogDialog import HgLogDialog |
| 1892 self.log = HgLogDialog(self, mode="incoming") | 1900 self.log = HgLogDialog(self, mode="incoming") |
| 1893 self.log.show() | 1901 self.log.show() |
| 1894 self.log.start(name) | 1902 self.log.start(name) |
| 1899 Mercurial repository. | 1907 Mercurial repository. |
| 1900 | 1908 |
| 1901 @param name file/directory name to show the log of (string) | 1909 @param name file/directory name to show the log of (string) |
| 1902 """ | 1910 """ |
| 1903 if self.getPlugin().getPreferences("UseLogBrowser"): | 1911 if self.getPlugin().getPreferences("UseLogBrowser"): |
| 1904 from .HgLogBrowserDialog import HgLogBrowserDialog | 1912 if self.logBrowserOutgoing is None: |
| 1905 self.logBrowser = HgLogBrowserDialog(self, mode="outgoing") | 1913 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 1906 self.logBrowser.show() | 1914 self.logBrowserOutgoing = HgLogBrowserDialog(self, mode="outgoing") |
| 1907 self.logBrowser.start(name) | 1915 self.logBrowserOutgoing.show() |
| 1916 self.logBrowserOutgoing.start(name) | |
| 1908 else: | 1917 else: |
| 1909 from .HgLogDialog import HgLogDialog | 1918 from .HgLogDialog import HgLogDialog |
| 1910 self.log = HgLogDialog(self, mode="outgoing") | 1919 self.log = HgLogDialog(self, mode="outgoing") |
| 1911 self.log.show() | 1920 self.log.show() |
| 1912 self.log.start(name) | 1921 self.log.start(name) |
| 2527 self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)")) | 2536 self.tr("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 2528 if file: | 2537 if file: |
| 2529 self.__lastChangeGroupPath = os.path.dirname(file) | 2538 self.__lastChangeGroupPath = os.path.dirname(file) |
| 2530 | 2539 |
| 2531 if self.getPlugin().getPreferences("UseLogBrowser"): | 2540 if self.getPlugin().getPreferences("UseLogBrowser"): |
| 2532 from .HgLogBrowserDialog import HgLogBrowserDialog | 2541 if self.logBrowserIncoming is None: |
| 2533 self.logBrowser = \ | 2542 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 2534 HgLogBrowserDialog(self, mode="incoming", bundle=file) | 2543 self.logBrowserIncoming = \ |
| 2535 self.logBrowser.show() | 2544 HgLogBrowserDialog(self, mode="incoming") |
| 2536 self.logBrowser.start(name) | 2545 self.logBrowserIncoming.show() |
| 2546 self.logBrowserIncoming.start(name, bundle=file) | |
| 2537 else: | 2547 else: |
| 2538 from .HgLogDialog import HgLogDialog | 2548 from .HgLogDialog import HgLogDialog |
| 2539 self.log = HgLogDialog(self, mode="incoming", bundle=file) | 2549 self.log = HgLogDialog(self, mode="incoming", bundle=file) |
| 2540 self.log.show() | 2550 self.log.show() |
| 2541 self.log.start(name) | 2551 self.log.start(name) |
