Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 564
- b3d966393ba9
- parent 553
- 5af61623ae3c
- child 660
- 7a1d92437921
equal
deleted
inserted
replaced
| 563:e35d2cda9a74 | 564:b3d966393ba9 |
|---|---|
| 472 args.append(name) | 472 args.append(name) |
| 473 | 473 |
| 474 if noDialog: | 474 if noDialog: |
| 475 self.startSynchronizedProcess(QProcess(), "hg", args, repodir) | 475 self.startSynchronizedProcess(QProcess(), "hg", args, repodir) |
| 476 else: | 476 else: |
| 477 dia = HgDialog(\ | 477 dia = HgDialog( |
| 478 self.trUtf8('Adding files/directories to the Mercurial repository')) | 478 self.trUtf8('Adding files/directories to the Mercurial repository')) |
| 479 res = dia.startProcess(args, repodir) | 479 res = dia.startProcess(args, repodir) |
| 480 if res: | 480 if res: |
| 481 dia.exec_() | 481 dia.exec_() |
| 482 | 482 |
| 532 return False | 532 return False |
| 533 | 533 |
| 534 if noDialog: | 534 if noDialog: |
| 535 res = self.startSynchronizedProcess(QProcess(), "hg", args, repodir) | 535 res = self.startSynchronizedProcess(QProcess(), "hg", args, repodir) |
| 536 else: | 536 else: |
| 537 dia = HgDialog(\ | 537 dia = HgDialog( |
| 538 self.trUtf8('Removing files/directories from the Mercurial repository')) | 538 self.trUtf8('Removing files/directories from the Mercurial repository')) |
| 539 res = dia.startProcess(args, repodir) | 539 res = dia.startProcess(args, repodir) |
| 540 if res: | 540 if res: |
| 541 dia.exec_() | 541 dia.exec_() |
| 542 res = dia.normalExitWithoutErrors() | 542 res = dia.normalExitWithoutErrors() |
| 1238 Public method used to view the (limited) log of a file/directory from the | 1238 Public method used to view the (limited) log of a file/directory from the |
| 1239 Mercurial repository. | 1239 Mercurial repository. |
| 1240 | 1240 |
| 1241 @param name file/directory name to show the log of (string) | 1241 @param name file/directory name to show the log of (string) |
| 1242 """ | 1242 """ |
| 1243 noEntries, ok = QInputDialog.getInteger(\ | 1243 noEntries, ok = QInputDialog.getInteger( |
| 1244 None, | 1244 None, |
| 1245 self.trUtf8("Mercurial Log"), | 1245 self.trUtf8("Mercurial Log"), |
| 1246 self.trUtf8("Select number of entries to show."), | 1246 self.trUtf8("Select number of entries to show."), |
| 1247 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) | 1247 self.getPlugin().getPreferences("LogLimit"), 1, 999999, 1) |
| 1248 if ok: | 1248 if ok: |
| 1714 | 1714 |
| 1715 dlg = HgBundleDialog(self.tagsList, self.branchesList) | 1715 dlg = HgBundleDialog(self.tagsList, self.branchesList) |
| 1716 if dlg.exec_() == QDialog.Accepted: | 1716 if dlg.exec_() == QDialog.Accepted: |
| 1717 rev, compression, all = dlg.getParameters() | 1717 rev, compression, all = dlg.getParameters() |
| 1718 | 1718 |
| 1719 fname, selectedFilter = QFileDialog.getSaveFileNameAndFilter(\ | 1719 fname, selectedFilter = QFileDialog.getSaveFileNameAndFilter( |
| 1720 None, | 1720 None, |
| 1721 self.trUtf8("Create changegroup"), | 1721 self.trUtf8("Create changegroup"), |
| 1722 repodir, | 1722 repodir, |
| 1723 self.trUtf8("Mercurial Changegroup Files (*.hg)"), | 1723 self.trUtf8("Mercurial Changegroup Files (*.hg)"), |
| 1724 None, | 1724 None, |
| 1774 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1774 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1775 repodir = os.path.dirname(repodir) | 1775 repodir = os.path.dirname(repodir) |
| 1776 if repodir == os.sep: | 1776 if repodir == os.sep: |
| 1777 return | 1777 return |
| 1778 | 1778 |
| 1779 file = QFileDialog.getOpenFileName(\ | 1779 file = QFileDialog.getOpenFileName( |
| 1780 None, | 1780 None, |
| 1781 self.trUtf8("Preview changegroup"), | 1781 self.trUtf8("Preview changegroup"), |
| 1782 repodir, | 1782 repodir, |
| 1783 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) | 1783 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 1784 if file: | 1784 if file: |
| 1805 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1805 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1806 repodir = os.path.dirname(repodir) | 1806 repodir = os.path.dirname(repodir) |
| 1807 if repodir == os.sep: | 1807 if repodir == os.sep: |
| 1808 return | 1808 return |
| 1809 | 1809 |
| 1810 file = QFileDialog.getOpenFileName(\ | 1810 file = QFileDialog.getOpenFileName( |
| 1811 None, | 1811 None, |
| 1812 self.trUtf8("Preview changegroup"), | 1812 self.trUtf8("Preview changegroup"), |
| 1813 repodir, | 1813 repodir, |
| 1814 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) | 1814 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 1815 if file: | 1815 if file: |
| 1835 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1835 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1836 repodir = os.path.dirname(repodir) | 1836 repodir = os.path.dirname(repodir) |
| 1837 if repodir == os.sep: | 1837 if repodir == os.sep: |
| 1838 return | 1838 return |
| 1839 | 1839 |
| 1840 files = QFileDialog.getOpenFileNames(\ | 1840 files = QFileDialog.getOpenFileNames( |
| 1841 None, | 1841 None, |
| 1842 self.trUtf8("Apply changegroups"), | 1842 self.trUtf8("Apply changegroups"), |
| 1843 repodir, | 1843 repodir, |
| 1844 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) | 1844 self.trUtf8("Mercurial Changegroup Files (*.hg);;All Files (*)")) |
| 1845 if files: | 1845 if files: |
| 1925 while not os.path.isdir(os.path.join(repodir, self.adminDir)): | 1925 while not os.path.isdir(os.path.join(repodir, self.adminDir)): |
| 1926 repodir = os.path.dirname(repodir) | 1926 repodir = os.path.dirname(repodir) |
| 1927 if repodir == os.sep: | 1927 if repodir == os.sep: |
| 1928 return | 1928 return |
| 1929 | 1929 |
| 1930 dia = HgDialog(\ | 1930 dia = HgDialog( |
| 1931 self.trUtf8('Removing files from the Mercurial repository only')) | 1931 self.trUtf8('Removing files from the Mercurial repository only')) |
| 1932 res = dia.startProcess(args, repodir) | 1932 res = dia.startProcess(args, repodir) |
| 1933 if res: | 1933 if res: |
| 1934 dia.exec_() | 1934 dia.exec_() |
| 1935 if isinstance(name, list): | 1935 if isinstance(name, list): |
