Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 882
- 34b86be88bf0
- parent 880
- 52ed20236a1c
- child 945
- 8cd4d08fa9f6
- child 967
- d0f77c6f3fd4
equal
deleted
inserted
replaced
| 881:ff23d907f87b | 882:34b86be88bf0 |
|---|---|
| 10 import os | 10 import os |
| 11 import shutil | 11 import shutil |
| 12 import urllib.request, urllib.parse, urllib.error | 12 import urllib.request, urllib.parse, urllib.error |
| 13 | 13 |
| 14 from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo | 14 from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo |
| 15 from PyQt4.QtGui import QApplication, QDialog, QInputDialog, QFileDialog | 15 from PyQt4.QtGui import QApplication, QDialog, QInputDialog |
| 16 | 16 |
| 17 from E5Gui.E5Application import e5App | 17 from E5Gui.E5Application import e5App |
| 18 from E5Gui import E5MessageBox | 18 from E5Gui import E5MessageBox, E5FileDialog |
| 19 | 19 |
| 20 from QScintilla.MiniEditor import MiniEditor | 20 from QScintilla.MiniEditor import MiniEditor |
| 21 | 21 |
| 22 from VCS.VersionControl import VersionControl | 22 from VCS.VersionControl import VersionControl |
| 23 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog | 23 from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog |
| 1719 | 1719 |
| 1720 dlg = HgBundleDialog(self.tagsList, self.branchesList) | 1720 dlg = HgBundleDialog(self.tagsList, self.branchesList) |
| 1721 if dlg.exec_() == QDialog.Accepted: | 1721 if dlg.exec_() == QDialog.Accepted: |
| 1722 rev, compression, all = dlg.getParameters() | 1722 rev, compression, all = dlg.getParameters() |
| 1723 | 1723 |
| 1724 fname, selectedFilter = QFileDialog.getSaveFileNameAndFilter( | 1724 fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( |
| 1725 None, | 1725 None, |
| 1726 self.trUtf8("Create changegroup"), | 1726 self.trUtf8("Create changegroup"), |
| 1727 repodir, | 1727 repodir, |
| 1728 self.trUtf8("Mercurial Changegroup Files (*.hg)"), | 1728 self.trUtf8("Mercurial Changegroup Files (*.hg)"), |
| 1729 None, | 1729 None, |
| 1730 QFileDialog.Options(QFileDialog.DontConfirmOverwrite | | 1730 E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite)) |
| 1731 QFileDialog.DontUseNativeDialog)) | |
| 1732 | 1731 |
| 1733 if not fname: | 1732 if not fname: |
| 1734 return # user aborted | 1733 return # user aborted |
| 1735 | 1734 |
| 1736 ext = QFileInfo(fname).suffix() | 1735 ext = QFileInfo(fname).suffix() |
| 1780 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1779 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1781 repodir = os.path.dirname(repodir) | 1780 repodir = os.path.dirname(repodir) |
| 1782 if repodir == os.sep: | 1781 if repodir == os.sep: |
| 1783 return | 1782 return |
| 1784 | 1783 |
| 1785 file = QFileDialog.getOpenFileName( | 1784 file = E5FileDialog.getOpenFileName( |
| 1786 None, | 1785 None, |
| 1787 self.trUtf8("Preview changegroup"), | 1786 self.trUtf8("Preview changegroup"), |
| 1788 repodir, | 1787 repodir, |
| 1789 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"), | 1788 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 1790 QFileDialog.DontUseNativeDialog) | |
| 1791 if file: | 1789 if file: |
| 1792 if self.getPlugin().getPreferences("UseLogBrowser"): | 1790 if self.getPlugin().getPreferences("UseLogBrowser"): |
| 1793 self.logBrowser = \ | 1791 self.logBrowser = \ |
| 1794 HgLogBrowserDialog(self, mode = "incoming", bundle = file) | 1792 HgLogBrowserDialog(self, mode = "incoming", bundle = file) |
| 1795 self.logBrowser.show() | 1793 self.logBrowser.show() |
| 1812 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1810 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1813 repodir = os.path.dirname(repodir) | 1811 repodir = os.path.dirname(repodir) |
| 1814 if repodir == os.sep: | 1812 if repodir == os.sep: |
| 1815 return | 1813 return |
| 1816 | 1814 |
| 1817 file = QFileDialog.getOpenFileName( | 1815 file = E5FileDialog.getOpenFileName( |
| 1818 None, | 1816 None, |
| 1819 self.trUtf8("Preview changegroup"), | 1817 self.trUtf8("Preview changegroup"), |
| 1820 repodir, | 1818 repodir, |
| 1821 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"), | 1819 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 1822 QFileDialog.DontUseNativeDialog) | |
| 1823 if file: | 1820 if file: |
| 1824 args = [] | 1821 args = [] |
| 1825 args.append('identify') | 1822 args.append('identify') |
| 1826 args.append(file) | 1823 args.append(file) |
| 1827 | 1824 |
| 1843 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1840 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1844 repodir = os.path.dirname(repodir) | 1841 repodir = os.path.dirname(repodir) |
| 1845 if repodir == os.sep: | 1842 if repodir == os.sep: |
| 1846 return | 1843 return |
| 1847 | 1844 |
| 1848 files = QFileDialog.getOpenFileNames( | 1845 files = E5FileDialog.getOpenFileNames( |
| 1849 None, | 1846 None, |
| 1850 self.trUtf8("Apply changegroups"), | 1847 self.trUtf8("Apply changegroups"), |
| 1851 repodir, | 1848 repodir, |
| 1852 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)"), | 1849 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 1853 QFileDialog.DontUseNativeDialog) | |
| 1854 if files: | 1850 if files: |
| 1855 update = E5MessageBox.yesNo(self.__ui, | 1851 update = E5MessageBox.yesNo(self.__ui, |
| 1856 self.trUtf8("Apply changegroups"), | 1852 self.trUtf8("Apply changegroups"), |
| 1857 self.trUtf8("""Shall the working directory be updated?"""), | 1853 self.trUtf8("""Shall the working directory be updated?"""), |
| 1858 yesDefault = True) | 1854 yesDefault = True) |
