Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3349
- 2a034a7f1f54
- parent 3328
- 15aaa8d3a840
- child 3353
- ddc966a494b0
equal
deleted
inserted
replaced
| 3346:39f9273ebd61 | 3349:2a034a7f1f54 |
|---|---|
| 1846 from UI.CompareDialog import CompareDialog | 1846 from UI.CompareDialog import CompareDialog |
| 1847 self.sbsDiff = CompareDialog() | 1847 self.sbsDiff = CompareDialog() |
| 1848 self.sbsDiff.show() | 1848 self.sbsDiff.show() |
| 1849 self.sbsDiff.compare(output1, output2, name1, name2) | 1849 self.sbsDiff.compare(output1, output2, name1, name2) |
| 1850 | 1850 |
| 1851 def hgLogBrowser(self, path, isFile=False): | 1851 def vcsLogBrowser(self, name, isFile=False): |
| 1852 """ | 1852 """ |
| 1853 Public method used to browse the log of a file/directory from the | 1853 Public method used to browse the log of a file/directory from the |
| 1854 Mercurial repository. | 1854 Mercurial repository. |
| 1855 | 1855 |
| 1856 @param path file/directory name to show the log of (string) | 1856 @param name file/directory name to show the log of (string) |
| 1857 @keyparam isFile flag indicating log for a file is to be shown | 1857 @keyparam isFile flag indicating log for a file is to be shown |
| 1858 (boolean) | 1858 (boolean) |
| 1859 """ | 1859 """ |
| 1860 if self.logBrowser is None: | 1860 if self.logBrowser is None: |
| 1861 from .HgLogBrowserDialog import HgLogBrowserDialog | 1861 from .HgLogBrowserDialog import HgLogBrowserDialog |
| 1862 self.logBrowser = HgLogBrowserDialog(self) | 1862 self.logBrowser = HgLogBrowserDialog(self) |
| 1863 self.logBrowser.show() | 1863 self.logBrowser.show() |
| 1864 self.logBrowser.start(path, isFile=isFile) | 1864 self.logBrowser.start(name, isFile=isFile) |
| 1865 | 1865 |
| 1866 def hgIncoming(self, name): | 1866 def hgIncoming(self, name): |
| 1867 """ | 1867 """ |
| 1868 Public method used to view the log of incoming changes from the | 1868 Public method used to view the log of incoming changes from the |
| 1869 Mercurial repository. | 1869 Mercurial repository. |
